From c68937b5ff35655f43a9db0ec1d328810fb9d331 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Evrard Date: Wed, 9 Dec 2020 13:45:52 +0100 Subject: [PATCH] Update for kubernetes 1.20 support This ensures we bump the code for 1.20. It updates the testing to ensure kured works on a 1.20 cluster, removes the testing on 1.17 (as it is now deprecated). Libraries remain on 1.19, to avoid breaking 1.18 clusters. --- .github/kind-cluster-1.20.yaml | 13 +++++++++++++ .github/workflows/on-pr.yaml | 4 ++-- .github/workflows/periodics-daily.yaml | 2 +- README.md | 2 +- charts/kured/Chart.yaml | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 .github/kind-cluster-1.20.yaml diff --git a/.github/kind-cluster-1.20.yaml b/.github/kind-cluster-1.20.yaml new file mode 100644 index 0000000..fb9dd28 --- /dev/null +++ b/.github/kind-cluster-1.20.yaml @@ -0,0 +1,13 @@ +kind: Cluster +apiVersion: kind.x-k8s.io/v1alpha4 +nodes: +- role: control-plane + image: "kindest/node:v1.20.0" +- role: control-plane + image: "kindest/node:v1.20.0" +- role: control-plane + image: "kindest/node:v1.20.0" +- role: worker + image: "kindest/node:v1.20.0" +- role: worker + image: "kindest/node:v1.20.0" diff --git a/.github/workflows/on-pr.yaml b/.github/workflows/on-pr.yaml index 92fd41c..cf3c261 100644 --- a/.github/workflows/on-pr.yaml +++ b/.github/workflows/on-pr.yaml @@ -78,8 +78,8 @@ jobs: strategy: matrix: kubernetes: - - 1.17 - - 1.19 + - "1.18" + - "1.20" steps: - uses: actions/checkout@v2 - name: Find go version diff --git a/.github/workflows/periodics-daily.yaml b/.github/workflows/periodics-daily.yaml index f94a6e3..4c6c3e7 100644 --- a/.github/workflows/periodics-daily.yaml +++ b/.github/workflows/periodics-daily.yaml @@ -59,9 +59,9 @@ jobs: strategy: matrix: kubernetes: - - 1.17 - 1.18 - 1.19 + - 1.20 steps: - uses: actions/checkout@v2 - name: Find go version diff --git a/README.md b/README.md index f36430a..be02b09 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ server: | kured | kubectl | k8s.io/client-go | k8s.io/apimachinery | expected kubernetes compatibility | |--------|---------|------------------|---------------------|-----------------------------------| -| master | 1.19.4 | v0.19.4 | v0.19.4 | 1.17.x, 1.18.x, 1.19.x | +| master | 1.19.4 | v0.19.4 | v0.19.4 | 1.18.x, 1.19.x, 1.20.x | | 1.5.1 | 1.18.8 | v0.18.8 | v0.18.8 | 1.17.x, 1.18.x, 1.19.x | | 1.4.4 | 1.17.7 | v0.17.0 | v0.17.0 | 1.16.x, 1.17.x, 1.18.x | | 1.3.0 | 1.15.10 | v12.0.0 | release-1.15 | 1.15.x, 1.16.x, 1.17.x | diff --git a/charts/kured/Chart.yaml b/charts/kured/Chart.yaml index 794a453..b3dddeb 100644 --- a/charts/kured/Chart.yaml +++ b/charts/kured/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "1.5.1" description: A Helm chart for kured name: kured -version: 2.2.2 +version: 2.2.3 home: https://github.com/weaveworks/kured maintainers: - name: ckotzbauer