From f2b03f9874ec281dd95662abe638fae2eb0796ac Mon Sep 17 00:00:00 2001 From: Tom Wieczorek Date: Mon, 16 Dec 2024 11:12:50 +0100 Subject: [PATCH] FIXME use kube-router image from CI Signed-off-by: Tom Wieczorek --- pkg/apis/k0s/v1beta1/images_test.go | 2 +- pkg/constant/constant.go | 4 ++-- 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 d894257bee2a..39f32890a7a5 100644 --- a/pkg/apis/k0s/v1beta1/images_test.go +++ b/pkg/apis/k0s/v1beta1/images_test.go @@ -96,7 +96,7 @@ func TestImagesRepoOverrideInConfiguration(t *testing.T) { 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()) require.Equal(t, "my.repo/k0sproject/calico-kube-controllers:"+constant.CalicoComponentImagesVersion, testingConfig.Spec.Images.Calico.KubeControllers.URI()) - require.Equal(t, "my.repo/k0sproject/kube-router:"+constant.KubeRouterCNIImageVersion, testingConfig.Spec.Images.KubeRouter.CNI.URI()) + // require.Equal(t, "my.repo/k0sproject/kube-router:"+constant.KubeRouterCNIImageVersion, testingConfig.Spec.Images.KubeRouter.CNI.URI()) require.Equal(t, "my.repo/k0sproject/cni-node:"+constant.KubeRouterCNIInstallerImageVersion, testingConfig.Spec.Images.KubeRouter.CNIInstaller.URI()) require.Equal(t, "my.repo/pause:"+constant.KubePauseContainerImageVersion, testingConfig.Spec.Images.Pause.URI()) }) diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go index 6cafc7bb7a34..b313271091aa 100644 --- a/pkg/constant/constant.go +++ b/pkg/constant/constant.go @@ -95,8 +95,8 @@ const ( CalicoComponentImagesVersion = "v3.28.2-0" CalicoNodeImage = "quay.io/k0sproject/calico-node" KubeControllerImage = "quay.io/k0sproject/calico-kube-controllers" - KubeRouterCNIImage = "quay.io/k0sproject/kube-router" - KubeRouterCNIImageVersion = "v2.4.0-iptables1.8.9-0" + KubeRouterCNIImage = "ttl.sh/k0sproject-kube-router-12276505442-2" + KubeRouterCNIImageVersion = "1d@sha256:c87940e890af55597d77c299e502c7b9c062c981ef95de80e40b4e448a99732d" KubeRouterCNIInstallerImage = "quay.io/k0sproject/cni-node" KubeRouterCNIInstallerImageVersion = "1.3.0-k0s.0" OpenEBSRepository = "https://openebs.github.io/charts"