From 1977c20d163e81d9cff22e9780b2f3cd5fb66ff7 Mon Sep 17 00:00:00 2001 From: 24sama Date: Fri, 17 Sep 2021 10:35:31 +0800 Subject: [PATCH] Support Kubernetes v1.21.5 Signed-off-by: 24sama --- README.md | 4 ++-- README_zh-CN.md | 4 ++-- apis/kubekey/v1alpha1/default.go | 2 +- docs/kubernetes-versions.md | 1 + pkg/files/file.go | 6 ++++++ version/k8s.go | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index af809997..f3604305 100644 --- a/README.md +++ b/README.md @@ -37,9 +37,9 @@ There are three scenarios to use KubeKey. * **v1.17**:   *v1.17.9* * **v1.18**:   *v1.18.6* -* **v1.19**:   *v1.19.8* (default) +* **v1.19**:   *v1.19.8* * **v1.20**:   *v1.20.6* -* **v1.21**:   *v1.21.4* +* **v1.21**:   *v1.21.5* (default) * **v1.22**:   *v1.22.1* > Looking for more supported versions [Click here](./docs/kubernetes-versions.md) diff --git a/README_zh-CN.md b/README_zh-CN.md index f8586a9c..35c202f8 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -37,9 +37,9 @@ * **v1.17**:   *v1.17.9* * **v1.18**:   *v1.18.6* -* **v1.19**:   *v1.19.8* (default) +* **v1.19**:   *v1.19.8* * **v1.20**:   *v1.20.6* -* **v1.21**:   *v1.21.4* +* **v1.21**:   *v1.21.5* (default) * **v1.22**:   *v1.22.1* > 查看更多支持的版本[点击这里](./docs/kubernetes-versions.md) diff --git a/apis/kubekey/v1alpha1/default.go b/apis/kubekey/v1alpha1/default.go index 3d58f585..131c404a 100644 --- a/apis/kubekey/v1alpha1/default.go +++ b/apis/kubekey/v1alpha1/default.go @@ -41,7 +41,7 @@ const ( DefaultEtcdPort = "2379" DefaultDockerVersion = "20.10.8" DefaultCrictlVersion = "v1.22.0" - DefaultKubeVersion = "v1.20.10" + DefaultKubeVersion = "v1.21.5" DefaultCalicoVersion = "v3.20.0" DefaultFlannelVersion = "v0.12.0" DefaultCniVersion = "v0.9.1" diff --git a/docs/kubernetes-versions.md b/docs/kubernetes-versions.md index 25dc414b..b1f51ac8 100644 --- a/docs/kubernetes-versions.md +++ b/docs/kubernetes-versions.md @@ -47,4 +47,5 @@ | v1.20.6 | :white_check_mark: | | v1.20.10 | :white_check_mark: | | v1.21.4 | :white_check_mark: | +| v1.21.5 | :white_check_mark: | | v1.22.1 | :white_check_mark: | diff --git a/pkg/files/file.go b/pkg/files/file.go index 8e7e3000..488d9c77 100644 --- a/pkg/files/file.go +++ b/pkg/files/file.go @@ -66,6 +66,7 @@ var ( "v1.20.6": "ff6fca46edeccd8a4dbf162079d0b3d27841b04885b3f47f80377b3a93ab1533", "v1.20.10": "da5864968a38e0bf2317965e87b5425e1b9101a49dd5178f2e967c0a46547270", "v1.21.4": "286794aed41148e82a77087d79111052ea894796c6ae81fc463275dcd848f98d", + "v1.21.5": "e384171fcb3c0de924904007bfd7babb0f970997b93223ed7ffee14d29019353", "v1.22.1": "50a5f0d186d7aefae309539e9cc7d530ef1a9b45ce690801655c2bee722d978c", }, arm64: { @@ -87,6 +88,7 @@ var ( "v1.20.6": "33837e290bd76fcb16af27db0e814ec023c25e6c41f25a0907b48756d4a2ffc2", "v1.20.10": "ec1f8df0f57b8aa6bddce2d6bb8d0503e016b022ba8a5f113ddf412d9a99c03c", "v1.21.4": "30645f57296281d214a9dd787a90bd16207df4b1fca7ac320913c616818a92cd", + "v1.21.5": "5a273b023eaa60d7820436b0f0062c4bd467274d6f2b86a9e13270c91d663618", "v1.22.1": "85df7978b2e5bb78064ed0bcce14a39d105a1a3968bb92ee5d2f96a1fa09ed12", }, }, @@ -115,6 +117,7 @@ var ( "v1.20.6": "7688a663dd06222d337c8fdb5b05e1d9377e6d64aa048c6acf484bc3f2a596a8", "v1.20.10": "de1b24f33d47cc4dc14a10f051d7d6fbbcf3800d3a07ddb45fc83660183c3a73", "v1.21.4": "cdd46617d1a501531c62421de3754d65f30ad24d75beae2693688993a12bb557", + "v1.21.5": "600f70fe0e69151b9d8ac65ec195bcc840687f86ba397fce27be1faae3538a6f", "v1.22.1": "2079780ad2ff993affc9b8e1a378bf5ee759bf87fdc446e6a892a0bbd7353683", }, arm64: { @@ -136,6 +139,7 @@ var ( "v1.20.6": "6e7b44d1ca65f970b0646f7d093dcf0cfefc44d4a67f29d542fe1b7ca6dcf715", "v1.20.10": "5107a4b2eb017039dda900cf263ec19484eee8bec070fc88803d3d9d4cc9fb18", "v1.21.4": "12c849ccc627e9404187adf432a922b895c8bdecfd7ca901e1928396558eb043", + "v1.21.5": "746a535956db55807ef71772d2a4afec5cc438233da23952167ec0aec6fe937b", "v1.22.1": "d5ffd67d8285fb224a1c49622fd739131f7b941e3d68f233dec96e72c9ebee63", }, }, @@ -164,6 +168,7 @@ var ( "v1.20.6": "89ae000df6bbdf38ae4307cc4ecc0347d5c871476862912c0a765db9bf05284e", "v1.20.10": "1e87edb99b7a92a142b458976ae75412d3ee22421793968b03213ddd007c0530", "v1.21.4": "9410572396fb31e49d088f9816beaebad7420c7686697578691be1651d3bf85a", + "v1.21.5": "060ede75550c63bdc84e14fcc4c8ab3017f7ffc032fc4cac3bf20d274fab1be4", "v1.22.1": "78178a8337fc6c76780f60541fca7199f0f1a2e9c41806bded280a4a5ef665c9", }, arm64: { @@ -185,6 +190,7 @@ var ( "v1.20.6": "1d0a29420c4488b15adb44044b193588989b95515cd6c8c03907dafe9b3d53f3", "v1.20.10": "e559bcf16c824a2337125f20a2d64bfbf3959c713aa4f711871a694e2f58d4d8", "v1.21.4": "8ac78de847118c94e2d87844e9b974556dfb30aff0e0d15fd03b82681df3ac98", + "v1.21.5": "fca8de7e55b55cceab9902aae03837fb2f1e72b97aa09b2ac9626bdbfd0466e4", "v1.22.1": "5c7ef1e505c35a8dc0b708f6b6ecdad6723875bb85554e9f9c3fe591e030ae5c", }, }, diff --git a/version/k8s.go b/version/k8s.go index a870a03e..9f160424 100644 --- a/version/k8s.go +++ b/version/k8s.go @@ -26,6 +26,7 @@ func SupportedK8sVersionList() []string { "v1.20.6", "v1.20.10", "v1.21.4", + "v1.21.5", "v1.22.1", } }