From 8bdb53b2ef111f2e566dc48812d02d2583892e1c Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Thu, 7 Apr 2022 21:02:25 +0000 Subject: [PATCH 1/5] Create dockershim banner --- data/announcements/scheduled.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/announcements/scheduled.yaml b/data/announcements/scheduled.yaml index 831ad1ebb6..635071dd4a 100644 --- a/data/announcements/scheduled.yaml +++ b/data/announcements/scheduled.yaml @@ -30,6 +30,15 @@ # leave the "announcements" key in place announcements: +- name: Dockershim removal coming in Kubernetes 1.24 + startTime: 2022-04-13T00:00:00 # Added in PR: + endTime: 2022-05-13T00:00:00 # Expires 2022-05-19 + style: "background: #3d4cb7" + title: "Dockershim removal: Read the FAQ" + message: | + As of Kubernetes 1.24, Dockershim will no longer be included in Kubernetes. + Read the [Dockershim Removal FAQ](https://kubernetes.io/blog/2022/02/17/dockershim-faq/) to see what this means to you. + - name: Kubecon 2020 NA startTime: 2020-10-26T00:00:00 # Added in https://github.com/kubernetes/website/pull/24714 endTime: 2020-11-23T00:00:00 # Removed in https://github.com/kubernetes/website/pull/25173 From f5f099c71d13ccdc5b1df96d196dd757f33febe5 Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Thu, 7 Apr 2022 21:08:40 +0000 Subject: [PATCH 2/5] Changed the wording --- data/announcements/scheduled.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/announcements/scheduled.yaml b/data/announcements/scheduled.yaml index 635071dd4a..fb049a84df 100644 --- a/data/announcements/scheduled.yaml +++ b/data/announcements/scheduled.yaml @@ -30,11 +30,11 @@ # leave the "announcements" key in place announcements: -- name: Dockershim removal coming in Kubernetes 1.24 +- name: Dockershim removal startTime: 2022-04-13T00:00:00 # Added in PR: endTime: 2022-05-13T00:00:00 # Expires 2022-05-19 style: "background: #3d4cb7" - title: "Dockershim removal: Read the FAQ" + title: "Dockershim removal set for Kubernetes 1.24" message: | As of Kubernetes 1.24, Dockershim will no longer be included in Kubernetes. Read the [Dockershim Removal FAQ](https://kubernetes.io/blog/2022/02/17/dockershim-faq/) to see what this means to you. From 7365b45a2d468412ad2bd9a1805b2e2fb75cba62 Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Thu, 7 Apr 2022 21:36:40 +0000 Subject: [PATCH 3/5] Added PR and changed expiration date --- data/announcements/scheduled.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/announcements/scheduled.yaml b/data/announcements/scheduled.yaml index fb049a84df..7dce812568 100644 --- a/data/announcements/scheduled.yaml +++ b/data/announcements/scheduled.yaml @@ -31,8 +31,8 @@ announcements: - name: Dockershim removal - startTime: 2022-04-13T00:00:00 # Added in PR: - endTime: 2022-05-13T00:00:00 # Expires 2022-05-19 + startTime: 2022-04-13T00:00:00 # Added in PR: https://github.com/kubernetes/website/pull/32805 + endTime: 2022-05-19T00:00:00 # Expires 2022-05-19 style: "background: #3d4cb7" title: "Dockershim removal set for Kubernetes 1.24" message: | From 1fba7dcc8a9b5feedb91b08e9c71e0aa3fa9a8d9 Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Fri, 8 Apr 2022 11:18:14 +0000 Subject: [PATCH 4/5] Fixed link --- data/announcements/scheduled.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/announcements/scheduled.yaml b/data/announcements/scheduled.yaml index 7dce812568..1568b8ee79 100644 --- a/data/announcements/scheduled.yaml +++ b/data/announcements/scheduled.yaml @@ -31,13 +31,13 @@ announcements: - name: Dockershim removal - startTime: 2022-04-13T00:00:00 # Added in PR: https://github.com/kubernetes/website/pull/32805 + startTime: 2022-04-07T00:00:00 # Added in PR: https://github.com/kubernetes/website/pull/32805 endTime: 2022-05-19T00:00:00 # Expires 2022-05-19 style: "background: #3d4cb7" title: "Dockershim removal set for Kubernetes 1.24" message: | As of Kubernetes 1.24, Dockershim will no longer be included in Kubernetes. - Read the [Dockershim Removal FAQ](https://kubernetes.io/blog/2022/02/17/dockershim-faq/) to see what this means to you. + Read the [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) to see what this means to you. - name: Kubecon 2020 NA startTime: 2020-10-26T00:00:00 # Added in https://github.com/kubernetes/website/pull/24714 From de066e6a7196f0a67f7ceb8a022f1e6a0731e8ab Mon Sep 17 00:00:00 2001 From: Christopher Negus Date: Tue, 12 Apr 2022 18:04:09 +0000 Subject: [PATCH 5/5] Responded to review comments --- data/announcements/scheduled.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/announcements/scheduled.yaml b/data/announcements/scheduled.yaml index 1568b8ee79..0713c4578e 100644 --- a/data/announcements/scheduled.yaml +++ b/data/announcements/scheduled.yaml @@ -32,12 +32,12 @@ announcements: - name: Dockershim removal startTime: 2022-04-07T00:00:00 # Added in PR: https://github.com/kubernetes/website/pull/32805 - endTime: 2022-05-19T00:00:00 # Expires 2022-05-19 - style: "background: #3d4cb7" + endTime: 2022-05-10T00:00:00 # Expires 2022-05-10, but will change text slightly on release date + style: "background: #326ce5" title: "Dockershim removal set for Kubernetes 1.24" message: | As of Kubernetes 1.24, Dockershim will no longer be included in Kubernetes. - Read the [Dockershim Removal FAQ](/blog/2022/02/17/dockershim-faq/) to see what this means to you. + Read the [Dockershim Removal FAQ](/dockershim) to see what this means to you. - name: Kubecon 2020 NA startTime: 2020-10-26T00:00:00 # Added in https://github.com/kubernetes/website/pull/24714