diff --git a/README.md b/README.md index 4e18daaf2..f46a7ac7d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Use KubeKey in the following three scenarios. * **v1.20**:   *v1.20.10* * **v1.21**:   *v1.21.13* * **v1.22**:   *v1.22.12* -* **v1.23**:   *v1.23.9* (default) +* **v1.23**:   *v1.23.10* (default) * **v1.24**:   *v1.24.3* > Looking for more supported versions > [Kubernetes Versions](./docs/kubernetes-versions.md) @@ -125,7 +125,7 @@ Quick Start is for `all-in-one` installation which is a good start to get famili ##### Examples -* Create a pure Kubernetes cluster with default version (Kubernetes v1.23.7). +* Create a pure Kubernetes cluster with default version (Kubernetes v1.23.10). ```shell script ./kk create cluster diff --git a/README_zh-CN.md b/README_zh-CN.md index 4253ebcd8..b4cea031e 100644 --- a/README_zh-CN.md +++ b/README_zh-CN.md @@ -41,7 +41,7 @@ * **v1.20**:   *v1.20.10* * **v1.21**:   *v1.21.13* * **v1.22**:   *v1.22.12* -* **v1.23**:   *v1.23.9* (default) +* **v1.23**:   *v1.23.10* (default) * **v1.24**:   *v1.24.3* > 查看更多支持的版本[点击这里](./docs/kubernetes-versions.md) diff --git a/apis/kubekey/v1alpha2/default.go b/apis/kubekey/v1alpha2/default.go index a9deeb65f..5e5941800 100644 --- a/apis/kubekey/v1alpha2/default.go +++ b/apis/kubekey/v1alpha2/default.go @@ -45,7 +45,7 @@ const ( DefaultContainerdVersion = "1.6.4" DefaultRuncVersion = "v1.1.1" DefaultCrictlVersion = "v1.24.0" - DefaultKubeVersion = "v1.23.9" + DefaultKubeVersion = "v1.23.10" DefaultCalicoVersion = "v3.23.2" DefaultFlannelVersion = "v0.12.0" DefaultCniVersion = "v0.9.1" diff --git a/docs/kubernetes-versions.md b/docs/kubernetes-versions.md index 3014987db..5e4d242d4 100644 --- a/docs/kubernetes-versions.md +++ b/docs/kubernetes-versions.md @@ -44,6 +44,7 @@ | v1.23.7 | :white_check_mark: | | v1.23.8 | :white_check_mark: | | v1.23.9 | :white_check_mark: | +| v1.23.10 | :white_check_mark: | | v1.24.0 | :white_check_mark: | | v1.24.1 | :white_check_mark: | | v1.24.2 | :white_check_mark: | @@ -95,6 +96,7 @@ | v1.23.7 | :white_check_mark: | | v1.23.8 | :white_check_mark: | | v1.23.9 | :white_check_mark: | +| v1.23.10 | :white_check_mark: | | v1.24.0 | :white_check_mark: | | v1.24.1 | :white_check_mark: | | v1.24.2 | :white_check_mark: | diff --git a/hack/fetch-kubernetes-hash.sh b/hack/fetch-kubernetes-hash.sh index 2e51fa78f..88a55fd09 100755 --- a/hack/fetch-kubernetes-hash.sh +++ b/hack/fetch-kubernetes-hash.sh @@ -1,7 +1,7 @@ #!/bin/bash v22_patch_max=12 -v23_patch_max=9 +v23_patch_max=10 v24_patch_max=3 versions=() diff --git a/pkg/files/file.go b/pkg/files/file.go index 12031e70d..6856b933f 100644 --- a/pkg/files/file.go +++ b/pkg/files/file.go @@ -356,6 +356,7 @@ var ( "v1.23.7": "d7d863213eeb4791cdbd7c5fd398cf0cc2ef1547b3a74de8285786040f75efd2", "v1.23.8": "edbd60fd6a7e11c71f848b3a6e5d1b5a2bb8ebd703e5490caa8db267361a7b89", "v1.23.9": "947571c50ab840796fdd4ffb129154c005dfcb0fe83c6eff392d46cf187fd296", + "v1.23.10": "43d186c3c58e3f8858c6a22bc71b5441282ac0ccbff6f1d0c2a66ee045986b64", "v1.24.0": "5e58a29eaaf69ea80e90d9780d2a2d5f189fd74f94ec3bec9e3823d472277318", "v1.24.1": "15e3193eecbc69330ada3f340c5a47999959bc227c735fa95e4aa79470c085d0", "v1.24.2": "028f73b8e7c2ae389817d34e0cb829a814ce2fac0a535a3aa0708f3133e3e712", @@ -405,6 +406,7 @@ var ( "v1.23.7": "65fd71aa138166039b7f4f3695308064abe7f41d2f157175e6527e60fb461eae", "v1.23.8": "9b3d8863ea4ab0438881ccfbe285568529462bc77ef4512b515397a002d81b22", "v1.23.9": "a0a007023db78e5f78d3d4cf3268b83f093201847c1c107ffb3dc695f988c113", + "v1.23.10": "42e957eebef78f6462644d9debc096616054ebd2832e95a176c07c28ebed645c", "v1.24.0": "3e0fa21b8ebce04ca919fdfea7cc756e5f645166b95d6e4b5d9912d7721f9004", "v1.24.1": "04f18fe097351cd16dc91cd3bde979201916686c6f4e1b87bae69ab4479fda04", "v1.24.2": "bd823b934d1445a020f8df5fe544722175024af62adbf6eb27dc7250d5db0548", @@ -456,6 +458,7 @@ var ( "v1.23.7": "518f67200e853253ed6424488d6148476144b6b796ec7c6160cff15769b3e12a", "v1.23.8": "1ba15ad4d9d99cfc3cbef922b5101492ad74e812629837ac2e5705a68cb7af1e", "v1.23.9": "a5975920be1de0768e77ef101e4e42b179406add242c0883a7dc598f2006d387", + "v1.23.10": "c2ba75b36000103af6fa2c3955c5b8a633b33740e234931441082e21a334b80b", "v1.24.0": "3d98ac8b4fb8dc99f9952226f2565951cc366c442656a889facc5b1b2ec2ba52", "v1.24.1": "fc352d5c983b0ccf47acd8816eb826d781f408d27263dd8f761dfb63e69abfde", "v1.24.2": "13da57d32be1debad3d8923e481f30aaa46bca7030b7e748b099d403b30e5343", @@ -505,6 +508,7 @@ var ( "v1.23.7": "e96b746a77b00c04f1926035899a583ce28f02e9a5dca26c1bfb8251ca6a43bb", "v1.23.8": "1b4ec707e29e8136e3516a437cb541a79c52c69b1331a7add2b47e7ac7d032e6", "v1.23.9": "c11b14ab3fa8e567c54e893c5a937f53618b26c9b62416cc8aa7760835f68350", + "v1.23.10": "8ce1c79ee7c5d346719e3637e72a51dd96fc7f2e1f443aa39b05c1d9d9de32c8", "v1.24.0": "8f066c9a048dd1704bf22ccf6e994e2fa2ea1175c9768a786f6cb6608765025e", "v1.24.1": "c2189c6956afda0f6002839f9f14a9b48c89dcc0228701e84856be36a3aac6bf", "v1.24.2": "40a8460e104fbf97abee9763f6e1f2143debc46cc6c9a1a18e21c1ff9960d8c0", @@ -556,6 +560,7 @@ var ( "v1.23.7": "b4c27ad52812ebf3164db927af1a01e503be3fb9dc5ffa058c9281d67c76f66e", "v1.23.8": "299803a347e2e50def7740c477f0dedc69fc9e18b26b2f10e9ff84a411edb894", "v1.23.9": "053561f7c68c5a037a69c52234e3cf1f91798854527692acd67091d594b616ce", + "v1.23.10": "3ffa658e7f1595f622577b160bdcdc7a5a90d09d234757ffbe53dd50c0cb88f7", "v1.24.0": "94d686bb6772f6fb59e3a32beff908ab406b79acdfb2427abdc4ac3ce1bb98d7", "v1.24.1": "0ec3c2dbafc6dd27fc8ad25fa27fc527b5d7356d1830c0efbb8adcf975d9e84a", "v1.24.2": "f15fb430afd79f79ef7cf94a4e402cd212f02d8ec5a5e6a7ba9c3d5a2f954542", @@ -605,6 +610,7 @@ var ( "v1.23.7": "5d59447a5facd8623a79c2a296a68a573789d2b102b902aafb3a730fc4bb0d3b", "v1.23.8": "b293fce0b3dec37d3f5b8875b8fddc64e02f0f54f54dd7742368973c52530890", "v1.23.9": "66659f614d06d0fe80c5eafdba7073940906de98ea5ee2a081d84fa37d8c5a21", + "v1.23.10": "d88b7777b3227dd49f44dbd1c7b918f9ddc5d016ecc47547a717a501fcdc316b", "v1.24.0": "449278789de283648e4076ade46816da249714f96e71567e035e9d17e1fff06d", "v1.24.1": "b817b54183e089494f8b925096e9b65af3a356d87f94b73929bf5a6028a06271", "v1.24.2": "5a4c3652f08b4d095b686e1323ac246edbd8b6e5edd5a2626fb71afbcd89bc79", diff --git a/pkg/version/kubernetes/version_enum.go b/pkg/version/kubernetes/version_enum.go index b887fbb6a..221e52d43 100644 --- a/pkg/version/kubernetes/version_enum.go +++ b/pkg/version/kubernetes/version_enum.go @@ -117,6 +117,7 @@ func SupportedK8sVersionList() []string { "v1.23.7", "v1.23.8", "v1.23.9", + "v1.23.10", "v1.24.0", "v1.24.1", "v1.24.2",