From 77b1236a523a124b701bd808de436ed3e4a84ca8 Mon Sep 17 00:00:00 2001 From: joshjms Date: Fri, 2 May 2025 23:34:54 +0800 Subject: [PATCH] fix: Kubernetes versions in unit tests Signed-off-by: joshjms --- cmd/kubeadm/app/images/images_test.go | 29 +++++++++++------------ cmd/kubeadm/app/phases/etcd/local_test.go | 2 +- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cmd/kubeadm/app/images/images_test.go b/cmd/kubeadm/app/images/images_test.go index c56d4578da4..0ab1c6c2255 100644 --- a/cmd/kubeadm/app/images/images_test.go +++ b/cmd/kubeadm/app/images/images_test.go @@ -27,8 +27,7 @@ import ( ) const ( - testversion = "v10.1.2-alpha.1.100+0123456789abcdef" - expected = "v10.1.2-alpha.1.100_0123456789abcdef" + testVersion = "v1.99.0" gcrPrefix = "registry.k8s.io" ) @@ -53,34 +52,34 @@ func TestGetKubernetesImage(t *testing.T) { }{ { image: constants.KubeAPIServer, - expected: GetGenericImage(gcrPrefix, "kube-apiserver", expected), + expected: GetGenericImage(gcrPrefix, "kube-apiserver", testVersion), cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: gcrPrefix, - KubernetesVersion: testversion, + KubernetesVersion: testVersion, }, }, { image: constants.KubeControllerManager, - expected: GetGenericImage(gcrPrefix, "kube-controller-manager", expected), + expected: GetGenericImage(gcrPrefix, "kube-controller-manager", testVersion), cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: gcrPrefix, - KubernetesVersion: testversion, + KubernetesVersion: testVersion, }, }, { image: constants.KubeScheduler, - expected: GetGenericImage(gcrPrefix, "kube-scheduler", expected), + expected: GetGenericImage(gcrPrefix, "kube-scheduler", testVersion), cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: gcrPrefix, - KubernetesVersion: testversion, + KubernetesVersion: testVersion, }, }, { image: constants.KubeProxy, - expected: GetGenericImage(gcrPrefix, "kube-proxy", expected), + expected: GetGenericImage(gcrPrefix, "kube-proxy", testVersion), cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: gcrPrefix, - KubernetesVersion: testversion, + KubernetesVersion: testVersion, }, }, } @@ -97,7 +96,7 @@ func TestGetKubernetesImage(t *testing.T) { } func TestGetEtcdImage(t *testing.T) { - testEtcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, testversion) + testEtcdVer, _, _ := constants.EtcdSupportedVersion(constants.SupportedEtcdVersion, testVersion) var tests = []struct { expected string cfg *kubeadmapi.ClusterConfiguration @@ -105,7 +104,7 @@ func TestGetEtcdImage(t *testing.T) { { cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "real.repo", - KubernetesVersion: testversion, + KubernetesVersion: testVersion, Etcd: kubeadmapi.Etcd{ Local: &kubeadmapi.LocalEtcd{}, }, @@ -115,7 +114,7 @@ func TestGetEtcdImage(t *testing.T) { { cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "real.repo", - KubernetesVersion: testversion, + KubernetesVersion: testVersion, Etcd: kubeadmapi.Etcd{ Local: &kubeadmapi.LocalEtcd{ ImageMeta: kubeadmapi.ImageMeta{ @@ -129,7 +128,7 @@ func TestGetEtcdImage(t *testing.T) { { cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: "real.repo", - KubernetesVersion: testversion, + KubernetesVersion: testVersion, Etcd: kubeadmapi.Etcd{ Local: &kubeadmapi.LocalEtcd{ ImageMeta: kubeadmapi.ImageMeta{ @@ -144,7 +143,7 @@ func TestGetEtcdImage(t *testing.T) { expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion), cfg: &kubeadmapi.ClusterConfiguration{ ImageRepository: gcrPrefix, - KubernetesVersion: testversion, + KubernetesVersion: testVersion, }, }, } diff --git a/cmd/kubeadm/app/phases/etcd/local_test.go b/cmd/kubeadm/app/phases/etcd/local_test.go index 0417ccb3880..9626ffa4704 100644 --- a/cmd/kubeadm/app/phases/etcd/local_test.go +++ b/cmd/kubeadm/app/phases/etcd/local_test.go @@ -80,7 +80,7 @@ func TestCreateLocalEtcdStaticPodManifestFile(t *testing.T) { }{ { cfg: &kubeadmapi.ClusterConfiguration{ - KubernetesVersion: "v1.7.0", + KubernetesVersion: "v1.99.0", Etcd: kubeadmapi.Etcd{ Local: &kubeadmapi.LocalEtcd{ DataDir: tmpdir + "/etcd",