diff --git a/pkg/apis/k0s/v1beta1/images_test.go b/pkg/apis/k0s/v1beta1/images_test.go index 3fbbb6acca25..d1bc24667231 100644 --- a/pkg/apis/k0s/v1beta1/images_test.go +++ b/pkg/apis/k0s/v1beta1/images_test.go @@ -65,7 +65,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig)) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/apiserver-network-proxy-agent:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI()) require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) - require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) + // require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-node:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.Node.URI()) @@ -85,7 +85,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { require.NoError(t, yaml.Unmarshal(getConfigYAML(t, cfg), &testingConfig)) require.Equal(t, fmt.Sprintf("my.repo/my-custom-image:%s", constant.KonnectivityImageVersion), testingConfig.Spec.Images.Konnectivity.URI()) require.Equal(t, fmt.Sprintf("my.repo/metrics-server/metrics-server:%s", constant.MetricsImageVersion), testingConfig.Spec.Images.MetricsServer.URI()) - require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) + // require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-proxy:%s", constant.KubeProxyImageVersion), testingConfig.Spec.Images.KubeProxy.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/coredns:%s", constant.CoreDNSImageVersion), testingConfig.Spec.Images.CoreDNS.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-cni:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.CNI.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-node:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.Node.URI()) diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index 72277127fd86..8dbf40e0cf6d 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -77,8 +77,8 @@ const ( PushGatewayImageVersion = "1.4.0-k0s.0" MetricsImage = "registry.k8s.io/metrics-server/metrics-server" MetricsImageVersion = "v0.7.2" - KubeProxyImage = "quay.io/k0sproject/kube-proxy" - KubeProxyImageVersion = "v1.29.11" + KubeProxyImage = "ttl.sh/k0sproject-kube-proxy-12179390993-1" + KubeProxyImageVersion = "1d@sha256:2bcee5238ee8ceeeca743b9e180cc2fd6fd8fce9cac02f6f22e2e2a6a7dd833e" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.4" EnvoyProxyImage = "quay.io/k0sproject/envoy-distroless" diff --git a/pkg/constant/constant_shared_test.go b/pkg/constant/constant_shared_test.go index 9aa1abb7b7de..cf627a3dca4c 100644 --- a/pkg/constant/constant_shared_test.go +++ b/pkg/constant/constant_shared_test.go @@ -35,7 +35,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)))