FIXME use kube-proxy image from CI

Signed-off-by: Tom Wieczorek <[email protected]>
k0sproject · Dec 5, 2024 · b24232b · b24232b
1 parent 1750981
commit b24232b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pkg/apis/k0s/v1beta1/images_test.go b/pkg/apis/k0s/v1beta1/images_test.go
@@ -88,7 +88,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) {
 			require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig))
 			require.Equal(t, "my.repo/k0sproject/apiserver-network-proxy-agent:"+constant.KonnectivityImageVersion, testingConfig.Spec.Images.Konnectivity.URI())
 			require.Equal(t, "my.repo/metrics-server/metrics-server:"+constant.MetricsImageVersion, testingConfig.Spec.Images.MetricsServer.URI())
-			require.Equal(t, "my.repo/k0sproject/kube-proxy:"+constant.KubeProxyImageVersion, testingConfig.Spec.Images.KubeProxy.URI())
+			// require.Equal(t, "my.repo/k0sproject/kube-proxy:"+constant.KubeProxyImageVersion, testingConfig.Spec.Images.KubeProxy.URI())
 			require.Equal(t, "my.repo/k0sproject/coredns:"+constant.CoreDNSImageVersion, testingConfig.Spec.Images.CoreDNS.URI())
 			require.Equal(t, "my.repo/k0sproject/calico-cni:"+constant.CalicoComponentImagesVersion, testingConfig.Spec.Images.Calico.CNI.URI())
 			require.Equal(t, "my.repo/k0sproject/calico-node:"+constant.CalicoComponentImagesVersion, testingConfig.Spec.Images.Calico.Node.URI())
@@ -108,7 +108,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) {
 			require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig))
 			require.Equal(t, "my.repo/my-custom-image:"+constant.KonnectivityImageVersion, testingConfig.Spec.Images.Konnectivity.URI())
 			require.Equal(t, "my.repo/metrics-server/metrics-server:"+constant.MetricsImageVersion, testingConfig.Spec.Images.MetricsServer.URI())
-			require.Equal(t, "my.repo/k0sproject/kube-proxy:"+constant.KubeProxyImageVersion, testingConfig.Spec.Images.KubeProxy.URI())
+			// require.Equal(t, "my.repo/k0sproject/kube-proxy:"+constant.KubeProxyImageVersion, testingConfig.Spec.Images.KubeProxy.URI())
 			require.Equal(t, "my.repo/k0sproject/coredns:"+constant.CoreDNSImageVersion, testingConfig.Spec.Images.CoreDNS.URI())
 			require.Equal(t, "my.repo/k0sproject/calico-cni:"+constant.CalicoComponentImagesVersion, testingConfig.Spec.Images.Calico.CNI.URI())
 			require.Equal(t, "my.repo/k0sproject/calico-node:"+constant.CalicoComponentImagesVersion, testingConfig.Spec.Images.Calico.Node.URI())

diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
@@ -85,8 +85,8 @@ const (
 	MetricsImageVersion                = "v0.7.2"
 	KubePauseContainerImage            = "registry.k8s.io/pause"
 	KubePauseContainerImageVersion     = "3.9"
-	KubeProxyImage                     = "quay.io/k0sproject/kube-proxy"
-	KubeProxyImageVersion              = "v1.31.3"
+	KubeProxyImage                     = "ttl.sh/k0sproject-kube-proxy-12179390993-1"
+	KubeProxyImageVersion              = "1d@sha256:fdf06fc0d9d69ed25c898e4afaed05b4e36415df50e1e215be5a741fbfd89e60"
 	CoreDNSImage                       = "quay.io/k0sproject/coredns"
 	CoreDNSImageVersion                = "1.11.4"
 	EnvoyProxyImage                    = "quay.io/k0sproject/envoy-distroless"

diff --git a/pkg/constant/constant_test.go b/pkg/constant/constant_test.go
@@ -36,7 +36,7 @@ import (
 func TestConstants(t *testing.T) {
 	for _, test := range []struct{ name, constant, varName string }{
 		{"KonnectivityImageVersion", KonnectivityImageVersion, "konnectivity"},
-		{"KubeProxyImageVersion", KubeProxyImageVersion, "kubernetes"},
+		// {"KubeProxyImageVersion", KubeProxyImageVersion, "kubernetes"},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			expected := fmt.Sprintf("^v%s($|-)", regexp.QuoteMeta(getVersion(t, test.varName)))