Apply registry override to sandbox (pause) image (#2925)

* Apply registry override to sandbox (pause) image Signed-off-by: Marvin Beckers <marvin@kubermatic.com> * Update fixtures Signed-off-by: Marvin Beckers <marvin@kubermatic.com> --------- Signed-off-by: Marvin Beckers <marvin@kubermatic.com>
kubermatic · Oct 11, 2023 · d2d1da3 · d2d1da3
1 parent 6cff0af
commit d2d1da3
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 15 deletions.
diff --git a/pkg/apis/kubeone/helpers.go b/pkg/apis/kubeone/helpers.go
@@ -241,21 +241,23 @@ func (crc ContainerRuntimeConfig) CRISocket() string {
 	return ""
 }
 
-func (v VersionConfig) SandboxImage() (string, error) {
+func (v VersionConfig) SandboxImage(imageRegistry func(string) string) (string, error) {
 	kubeSemVer, err := semver.NewVersion(v.Kubernetes)
 	if err != nil {
 		return "", fail.Config(err, "parsing kubernetes semver")
 	}
 
+	registry := imageRegistry("registry.k8s.io")
+
 	switch {
 	case v124Constraint.Check(kubeSemVer):
-		return "registry.k8s.io/pause:3.7", nil
+		return fmt.Sprintf("%s/pause:3.7", registry), nil
 	case v125Constraint.Check(kubeSemVer):
-		return "registry.k8s.io/pause:3.8", nil
+		return fmt.Sprintf("%s/pause:3.8", registry), nil
 	case v126AndNewerConstraint.Check(kubeSemVer):
 		fallthrough
 	default:
-		return "registry.k8s.io/pause:3.9", nil
+		return fmt.Sprintf("%s/pause:3.9", registry), nil
 	}
 }
 

diff --git a/pkg/containerruntime/containerd_config.go b/pkg/containerruntime/containerd_config.go
@@ -81,7 +81,7 @@ type containerdRegistryTLSConfig struct {
 }
 
 func marshalContainerdConfig(cluster *kubeoneapi.KubeOneCluster) (string, error) {
-	sandboxImage, serr := cluster.Versions.SandboxImage()
+	sandboxImage, serr := cluster.Versions.SandboxImage(cluster.RegistryConfiguration.ImageRegistry)
 	if serr != nil {
 		return "", serr
 	}

diff --git a/pkg/containerruntime/testdata/Test_marshalContainerdConfig-override_insecure_registry.golden b/pkg/containerruntime/testdata/Test_marshalContainerdConfig-override_insecure_registry.golden
@@ -5,7 +5,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "some.registry/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmAmazonLinux-with_containerd_with_insecure_registry.golden
@@ -106,7 +106,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmCentOS-with_containerd_with_insecure_registry.golden
@@ -118,7 +118,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmDebian-with_containerd_with_insecure_registry.golden
@@ -100,7 +100,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden b/pkg/scripts/testdata/TestKubeadmFlatcar-with_containerd_with_insecure_registry.golden
@@ -79,7 +79,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden b/pkg/scripts/testdata/TestMigrateToContainerd-insecureRegistry.golden
@@ -16,7 +16,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "some.registry/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden b/pkg/scripts/testdata/TestUpgradeKubeadmAndCNIFlatcar.golden
@@ -27,7 +27,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden b/pkg/scripts/testdata/TestUpgradeKubeletAndKubectlFlatcar.golden
@@ -29,7 +29,7 @@ address = "127.0.0.1:1338"
 
 [plugins]
 [plugins."io.containerd.grpc.v1.cri"]
-sandbox_image = "registry.k8s.io/pause:3.9"
+sandbox_image = "127.0.0.1:5000/pause:3.9"
 [plugins."io.containerd.grpc.v1.cri".containerd]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]

diff --git a/pkg/templates/kubeadm/v1beta3/kubeadm.go b/pkg/templates/kubeadm/v1beta3/kubeadm.go
@@ -225,7 +225,7 @@ func NewConfig(s *state.State, host kubeoneapi.HostConfig) ([]runtime.Object, er
 	if cluster.AssetConfiguration.Pause.ImageRepository != "" {
 		nodeRegistration.KubeletExtraArgs["pod-infra-container-image"] = cluster.AssetConfiguration.Pause.ImageRepository + "/pause:" + cluster.AssetConfiguration.Pause.ImageTag
 	} else {
-		sandboxImage, serr := cluster.Versions.SandboxImage()
+		sandboxImage, serr := cluster.Versions.SandboxImage(cluster.RegistryConfiguration.ImageRegistry)
 		if serr != nil {
 			return nil, serr
 		}
@@ -454,7 +454,7 @@ func NewConfigWorker(s *state.State, host kubeoneapi.HostConfig) ([]runtime.Obje
 	if cluster.AssetConfiguration.Pause.ImageRepository != "" {
 		nodeRegistration.KubeletExtraArgs["pod-infra-container-image"] = cluster.AssetConfiguration.Pause.ImageRepository + "/pause:" + cluster.AssetConfiguration.Pause.ImageTag
 	} else {
-		sandboxImage, serr := cluster.Versions.SandboxImage()
+		sandboxImage, serr := cluster.Versions.SandboxImage(s.Cluster.RegistryConfiguration.ImageRegistry)
 		if serr != nil {
 			return nil, serr
 		}