From 3e400c88fe04236b0e5403c85ac722bc61376eea Mon Sep 17 00:00:00 2001 From: sameer khan <74293949+sameerkhan97@users.noreply.github.com> Date: Fri, 24 Feb 2023 00:10:46 +0530 Subject: [PATCH] Update v2.2 management cluster to support k8s v1.25 (#4426) * Update v2.2 management cluster version to support k8s v1.25 Signed-off-by: sameerkhan97 * Update unit tests to validate new k8s version Signed-off-by: sameerkhan97 --------- Signed-off-by: sameerkhan97 --- tkg/tkgconfighelper/tkgconfighelper_test.go | 11 +++++++++++ tkg/tkgconfighelper/validate.go | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tkg/tkgconfighelper/tkgconfighelper_test.go b/tkg/tkgconfighelper/tkgconfighelper_test.go index 191ac496a0..0e839210fe 100644 --- a/tkg/tkgconfighelper/tkgconfighelper_test.go +++ b/tkg/tkgconfighelper/tkgconfighelper_test.go @@ -21,6 +21,7 @@ const ( k8sVersion1dot18dot1vmware1 = "v1.18.1+vmware.1" k8sVersion1dot19dot1vmware1 = "v1.19.1+vmware.1" k8sVersion2dot16dot1vmware1 = "v2.16.1+vmware.1" + k8sVersion1dot25dot6vmware1 = "v1.25.6+vmware.1" tkgVersion1dot0dot0 = "v1.0.0" tkgVersion1dot1dot0 = "v1.1.0" tkgVersion1dot1dot0rc1 = "v1.1.0-rc.1" @@ -246,6 +247,16 @@ var _ = Describe("ValidateK8sVersionSupport", func() { Expect(err).NotTo(HaveOccurred()) }) }) + Context("mgmtClusterVersion= v2.2.0, kubernetesVersion=v1.25.6+vmware.1", func() { + BeforeEach(func() { + mgmtClusterVersion = "v2.2.0" + kubernetesVersion = k8sVersion1dot25dot6vmware1 + }) + It("should not return error", func() { + Expect(err).NotTo(HaveOccurred()) + }) + }) + }) }) diff --git a/tkg/tkgconfighelper/validate.go b/tkg/tkgconfighelper/validate.go index 8fc7207b33..fc5a2bd877 100644 --- a/tkg/tkgconfighelper/validate.go +++ b/tkg/tkgconfighelper/validate.go @@ -24,7 +24,7 @@ var ManagementClusterVersionToK8sVersionSupportMatrix = map[string][]string{ "v1.6": {"v1.20", "v1.21", "v1.22", "v1.23"}, "v1.7": {"v1.21", "v1.22", "v1.23", "v1.24"}, "v2.1": {"v1.21", "v1.22", "v1.23", "v1.24"}, - "v2.2": {"v1.21", "v1.22", "v1.23", "v1.24"}, + "v2.2": {"v1.21", "v1.22", "v1.23", "v1.24", "v1.25"}, } // ValidateK8sVersionSupport validates the k8s version is supported on management cluster or not