Replace k8s.gcr.io with registry.k8s.io in kubeadm

Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
kubermatic · Nov 27, 2022 · 69f3285 · 69f3285
1 parent 07ce28c
commit 69f3285
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/pkg/templates/kubeadm/v1beta3/kubeadm.go b/pkg/templates/kubeadm/v1beta3/kubeadm.go
@@ -70,6 +70,10 @@ const (
 	lowerThan122 = "< 1.22.0"
 )
 
+const (
+	registryK8sio = "registry.k8s.io"
+)
+
 var (
 	fixedEtcd123Constraint       = semverutil.MustParseConstraint(fixedEtcd123)
 	fixedEtcd124Constraint       = semverutil.MustParseConstraint(fixedEtcd124)
@@ -178,19 +182,19 @@ func NewConfig(s *state.State, host kubeoneapi.HostConfig) ([]runtime.Object, er
 			ExtraVolumes: []kubeadmv1beta3.HostPathMount{},
 		},
 		ClusterName:     cluster.Name,
-		ImageRepository: cluster.AssetConfiguration.Kubernetes.ImageRepository,
+		ImageRepository: defaults(cluster.AssetConfiguration.Kubernetes.ImageRepository, registryK8sio),
 		Etcd: kubeadmv1beta3.Etcd{
 			Local: &kubeadmv1beta3.LocalEtcd{
 				ImageMeta: kubeadmv1beta3.ImageMeta{
-					ImageRepository: cluster.AssetConfiguration.Etcd.ImageRepository,
+					ImageRepository: defaults(cluster.AssetConfiguration.Etcd.ImageRepository, registryK8sio),
 					ImageTag:        etcdImageTag,
 				},
 				ExtraArgs: etcdExtraArgs,
 			},
 		},
 		DNS: kubeadmv1beta3.DNS{
 			ImageMeta: kubeadmv1beta3.ImageMeta{
-				ImageRepository: cluster.AssetConfiguration.CoreDNS.ImageRepository,
+				ImageRepository: defaults(cluster.AssetConfiguration.CoreDNS.ImageRepository, fmt.Sprintf("%s/coredns", registryK8sio)),
 				ImageTag:        cluster.AssetConfiguration.CoreDNS.ImageTag,
 			},
 		},
@@ -547,3 +551,11 @@ func etcdVersionCorruptCheckExtraArgs(kubeVersion *semver.Version, etcdImageTag
 		return fixedEtcdVersion, etcdExtraArgs
 	}
 }
+
+func defaults(input, defaultValue string) string {
+	if input != "" {
+		return input
+	}
+
+	return defaultValue
+}