From e1d975f018ec5df79cdc5928133ebee8e037816d Mon Sep 17 00:00:00 2001
From: pixiake <guofeng@yunify.com>
Date: Sun, 24 Apr 2022 14:11:44 +0800
Subject: [PATCH] Support Kubernetes v1.22.9 and v1.23.6

Signed-off-by: pixiake <guofeng@yunify.com>
---
 docs/kubernetes-versions.md            | 60 ++++++++++++++------------
 pkg/files/file.go                      | 12 ++++++
 pkg/version/kubernetes/version_enum.go |  2 +
 3 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/docs/kubernetes-versions.md b/docs/kubernetes-versions.md
index 49b5b23e..d5f38b0a 100644
--- a/docs/kubernetes-versions.md
+++ b/docs/kubernetes-versions.md
@@ -1,31 +1,33 @@
 ## Kubernetes Versions(amd64)
-| Version   |     Supported      |
-| --------  | ------------------ |
-| v1.15.12  | :white_check_mark: |
-| v1.16.8   | :white_check_mark: |
-| v1.16.10  | :white_check_mark: |
-| v1.16.12  | :white_check_mark: |
-| v1.16.13  | :white_check_mark: |
-| v1.17.0   | :white_check_mark: |
-| v1.17.4   | :white_check_mark: |
-| v1.17.5   | :white_check_mark: |
-| v1.17.6   | :white_check_mark: |
-| v1.17.7   | :white_check_mark: |
-| v1.17.8   | :white_check_mark: |
-| v1.17.9   | :white_check_mark: |
-| v1.18.3   | :white_check_mark: |
-| v1.18.5   | :white_check_mark: |
-| v1.18.6   | :white_check_mark: |
-| v1.18.8   | :white_check_mark: |
-| v1.19.0   | :white_check_mark: |
-| v1.19.8   | :white_check_mark: |
-| v1.19.9   | :white_check_mark: |
-| v1.20.4   | :white_check_mark: |
-| v1.20.6   | :white_check_mark: |
-| v1.20.10   | :white_check_mark: |
-| v1.21.4   | :white_check_mark: |
-| v1.22.1   | :white_check_mark: |
-| v1.23.0   | :white_check_mark: |
+| Version  |     Supported      |
+|----------| ------------------ |
+| v1.15.12 | :white_check_mark: |
+| v1.16.8  | :white_check_mark: |
+| v1.16.10 | :white_check_mark: |
+| v1.16.12 | :white_check_mark: |
+| v1.16.13 | :white_check_mark: |
+| v1.17.0  | :white_check_mark: |
+| v1.17.4  | :white_check_mark: |
+| v1.17.5  | :white_check_mark: |
+| v1.17.6  | :white_check_mark: |
+| v1.17.7  | :white_check_mark: |
+| v1.17.8  | :white_check_mark: |
+| v1.17.9  | :white_check_mark: |
+| v1.18.3  | :white_check_mark: |
+| v1.18.5  | :white_check_mark: |
+| v1.18.6  | :white_check_mark: |
+| v1.18.8  | :white_check_mark: |
+| v1.19.0  | :white_check_mark: |
+| v1.19.8  | :white_check_mark: |
+| v1.19.9  | :white_check_mark: |
+| v1.20.4  | :white_check_mark: |
+| v1.20.6  | :white_check_mark: |
+| v1.20.10 | :white_check_mark: |
+| v1.21.4  | :white_check_mark: |
+| v1.22.1  | :white_check_mark: |
+| v1.22.9  | :white_check_mark: |
+| v1.23.0  | :white_check_mark: |
+| v1.23.6  | :white_check_mark: |
 
 ## Kubernetes Versions(arm64)
 | Version   |     Supported      |
@@ -50,4 +52,6 @@
 | v1.21.4   | :white_check_mark: |
 | v1.21.5   | :white_check_mark: |
 | v1.22.1   | :white_check_mark: |
-| v1.23.0   | :white_check_mark: |
+| v1.22.9  | :white_check_mark: |
+| v1.23.0  | :white_check_mark: |
+| v1.23.6  | :white_check_mark: |
diff --git a/pkg/files/file.go b/pkg/files/file.go
index 831be920..3d1997e2 100644
--- a/pkg/files/file.go
+++ b/pkg/files/file.go
@@ -330,7 +330,9 @@ var (
 				"v1.21.5":  "e384171fcb3c0de924904007bfd7babb0f970997b93223ed7ffee14d29019353",
 				"v1.21.6":  "fef4b40acd982da99294be07932eabedd476113ce5dc38bb9149522e32dada6d",
 				"v1.22.1":  "50a5f0d186d7aefae309539e9cc7d530ef1a9b45ce690801655c2bee722d978c",
+				"v1.22.9":  "e3061f3a9c52bff82ae740c928fe389a256964a5756d691758bf3611904d7183",
 				"v1.23.0":  "e21269a058d4ad421cf5818d4c7825991b8ba51cd06286932a33b21293b071b0",
+				"v1.23.6":  "9213c7d738e86c9a562874021df832735236fcfd5599fd4474bab3283d34bfd7",
 			},
 			arm64: {
 				"v1.15.12": "dfc1af35cccac89099a7e9a48dcc4b0d956a8b1d4dfcdd2be12191b6f6c384a3",
@@ -354,7 +356,9 @@ var (
 				"v1.21.5":  "5a273b023eaa60d7820436b0f0062c4bd467274d6f2b86a9e13270c91d663618",
 				"v1.21.6":  "498325da2521ce67b27902967daf4087153c5797070e03bf0bdd7c846f4d61a8",
 				"v1.22.1":  "85df7978b2e5bb78064ed0bcce14a39d105a1a3968bb92ee5d2f96a1fa09ed12",
+				"v1.22.9":  "0168c60d1997435b006b17c95a1d42e55743048cc50ee16c8774498aa203a202",
 				"v1.23.0":  "989d117128dcaa923b2c7a917a03f4836c1b023fe1ee723541e0e39b068b93a6",
+				"v1.23.6":  "a4db7458e224c3a2a7b468fc2704b31fec437614914b26a9e3d9efb6eecf61ee",
 			},
 		},
 		kubelet: {
@@ -385,7 +389,9 @@ var (
 				"v1.21.5":  "600f70fe0e69151b9d8ac65ec195bcc840687f86ba397fce27be1faae3538a6f",
 				"v1.21.6":  "422c29a1ba3bfeb2fc26ebd1c3596847fbbeeeef0ce2694515504513dc907813",
 				"v1.22.1":  "2079780ad2ff993affc9b8e1a378bf5ee759bf87fdc446e6a892a0bbd7353683",
+				"v1.22.9":  "61530a9e6a5cb1f971295de860a8ade29db65d0dff50d1ffff3de1155dfd0c02",
 				"v1.23.0":  "4756ff345dd80704b749d87efb8eb294a143a1f4a251ec586197d26ad20ea518",
+				"v1.23.6":  "fbb83e35f6b9f7cae19c50694240291805ca9c4028676af868306553b3e9266c",
 			},
 			arm64: {
 				"v1.15.12": "c7f586a77acdb3c3e27a6b3bd749760538b830414575f8718f03f7ce53b138d8",
@@ -409,7 +415,9 @@ var (
 				"v1.21.5":  "746a535956db55807ef71772d2a4afec5cc438233da23952167ec0aec6fe937b",
 				"v1.21.6":  "041441623c31bc6b0295342b8a2a5930d87545473e7c761ea79f3ff186c0ff52",
 				"v1.22.1":  "d5ffd67d8285fb224a1c49622fd739131f7b941e3d68f233dec96e72c9ebee63",
+				"v1.22.9":  "d7a692ee4f5f5929a15c61947ae2deecb71b0945461f6064ced83d13094028e8",
 				"v1.23.0":  "a546fb7ccce69c4163e4a0b19a31f30ea039b4e4560c23fd6e3016e2b2dfd0d9",
+				"v1.23.6":  "11a0310e8e7af5a11539ac26d6c14cf1b77d35bce4ca74e4bbd053ed1afc8650",
 			},
 		},
 		kubectl: {
@@ -440,7 +448,9 @@ var (
 				"v1.21.5":  "060ede75550c63bdc84e14fcc4c8ab3017f7ffc032fc4cac3bf20d274fab1be4",
 				"v1.21.6":  "810eadc2673e0fab7044f88904853e8f3f58a4134867370bf0ccd62c19889eaa",
 				"v1.22.1":  "78178a8337fc6c76780f60541fca7199f0f1a2e9c41806bded280a4a5ef665c9",
+				"v1.22.9":  "ae6a9b585f9a366d24bb71f508bfb9e2bb90822136138109d3a91cd28e6563bb",
 				"v1.23.0":  "2d0f5ba6faa787878b642c151ccb2c3390ce4c1e6c8e2b59568b3869ba407c4f",
+				"v1.23.6":  "703a06354bab9f45c80102abff89f1a62cbc2c6d80678fd3973a014acc7c500a",
 			},
 			arm64: {
 				"v1.15.12": "ef9a4272d556851c645d6788631a2993823260a7e1176a281620284b4c3406da",
@@ -464,7 +474,9 @@ var (
 				"v1.21.5":  "fca8de7e55b55cceab9902aae03837fb2f1e72b97aa09b2ac9626bdbfd0466e4",
 				"v1.21.6":  "a193997181cdfa00be0420ac6e7f4cfbf6cedd6967259c5fda1d558fa9f4efe0",
 				"v1.22.1":  "5c7ef1e505c35a8dc0b708f6b6ecdad6723875bb85554e9f9c3fe591e030ae5c",
+				"v1.22.9":  "33724bed4dddf4d8ecd6ae75667552d121e2fb575ff2db427ce66516e048edac",
 				"v1.23.0":  "1d77d6027fc8dfed772609ad9bd68f611b7e4ce73afa949f27084ad3a92b15fe",
+				"v1.23.6":  "4be771c8e6a082ba61f0367077f480237f9858ef5efe14b1dbbfc05cd42fc360",
 			},
 		},
 		etcd: {
diff --git a/pkg/version/kubernetes/version_enum.go b/pkg/version/kubernetes/version_enum.go
index 2cc1c963..22f3e1e3 100644
--- a/pkg/version/kubernetes/version_enum.go
+++ b/pkg/version/kubernetes/version_enum.go
@@ -110,6 +110,8 @@ func SupportedK8sVersionList() []string {
 		"v1.21.4",
 		"v1.21.5",
 		"v1.22.1",
+		"v1.22.9",
 		"v1.23.0",
+		"v1.23.6",
 	}
 }