From a4e11895fe365daa4bc0b870c30fb4c35074159c Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Thu, 22 Feb 2024 14:45:52 +0100 Subject: [PATCH] FIXME use kube-proxy from upstream Make the non-armv7 tests pass without actually publishing a k0s image yet. Signed-off-by: Tom Wieczorek --- pkg/apis/k0s/v1beta1/images_test.go | 4 ++-- pkg/constant/constant.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/apis/k0s/v1beta1/images_test.go b/pkg/apis/k0s/v1beta1/images_test.go index fcce80f5800c..3784bfe84608 100644 --- a/pkg/apis/k0s/v1beta1/images_test.go +++ b/pkg/apis/k0s/v1beta1/images_test.go @@ -64,7 +64,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/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()) @@ -84,7 +84,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/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.go b/pkg/constant/constant.go index 2cb1343aa371..8452618f857f 100644 --- a/pkg/constant/constant.go +++ b/pkg/constant/constant.go @@ -83,7 +83,7 @@ const ( MetricsImageVersion = "v0.7.0" KubePauseContainerImage = "registry.k8s.io/pause" KubePauseContainerImageVersion = "3.9" - KubeProxyImage = "quay.io/k0sproject/kube-proxy" + KubeProxyImage = "registry.k8s.io/kube-proxy" KubeProxyImageVersion = "v1.30.0-beta.0" CoreDNSImage = "quay.io/k0sproject/coredns" CoreDNSImageVersion = "1.11.1"