diff --git a/pkg/apis/k0s/v1beta1/images.go b/pkg/apis/k0s/v1beta1/images.go index 9ab42d856473..78592ef8e585 100644 --- a/pkg/apis/k0s/v1beta1/images.go +++ b/pkg/apis/k0s/v1beta1/images.go @@ -179,7 +179,7 @@ func DefaultClusterImages() *ClusterImages { }, Node: ImageSpec{ Image: constant.CalicoNodeImage, - Version: constant.CalicoComponentImagesVersion, + Version: "v3.26.1-1", }, KubeControllers: ImageSpec{ Image: constant.KubeControllerImage, diff --git a/pkg/apis/k0s/v1beta1/images_test.go b/pkg/apis/k0s/v1beta1/images_test.go index fcce80f5800c..4966fd20bf42 100644 --- a/pkg/apis/k0s/v1beta1/images_test.go +++ b/pkg/apis/k0s/v1beta1/images_test.go @@ -67,10 +67,10 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { 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()) + require.Equal(t, fmt.Sprintf("my.repo/twz123/calico-node:%s", "v3.26.1-1"), testingConfig.Spec.Images.Calico.Node.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-kube-controllers:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.KubeControllers.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()) + require.Equal(t, fmt.Sprintf("my.repo/twz123/calico-node:%s", "v3.26.1-1"), testingConfig.Spec.Images.Calico.Node.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-kube-controllers:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.KubeControllers.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/kube-router:%s", constant.KubeRouterCNIImageVersion), testingConfig.Spec.Images.KubeRouter.CNI.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/cni-node:%s", constant.KubeRouterCNIInstallerImageVersion), testingConfig.Spec.Images.KubeRouter.CNIInstaller.URI()) @@ -87,7 +87,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { 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()) + require.Equal(t, fmt.Sprintf("my.repo/twz123/calico-node:%s", "v3.26.1-1"), testingConfig.Spec.Images.Calico.Node.URI()) require.Equal(t, fmt.Sprintf("my.repo/k0sproject/calico-kube-controllers:%s", constant.CalicoComponentImagesVersion), testingConfig.Spec.Images.Calico.KubeControllers.URI()) }) }) diff --git a/pkg/constant/constant_shared.go b/pkg/constant/constant_shared.go index a7b5deee7961..0922320a404c 100644 --- a/pkg/constant/constant_shared.go +++ b/pkg/constant/constant_shared.go @@ -85,7 +85,7 @@ const ( EnvoyProxyImageVersion = "v1.24.1" CalicoImage = "quay.io/k0sproject/calico-cni" CalicoComponentImagesVersion = "v3.26.1-0" - CalicoNodeImage = "quay.io/k0sproject/calico-node" + CalicoNodeImage = "quay.io/twz123/calico-node" KubeControllerImage = "quay.io/k0sproject/calico-kube-controllers" KubeRouterCNIImage = "quay.io/k0sproject/kube-router" KubeRouterCNIImageVersion = "v1.5.1"