diff --git a/internal/builders/controlplane/deployment.go b/internal/builders/controlplane/deployment.go index eef899a..283d4c4 100644 --- a/internal/builders/controlplane/deployment.go +++ b/internal/builders/controlplane/deployment.go @@ -288,7 +288,7 @@ func (d *Deployment) BuildScheduler(podSpec *corev1.PodSpec, tenantControlPlane args["--leader-elect"] = "true" //nolint:goconst podSpec.Containers[schedulerIndex].Name = "kube-scheduler" - podSpec.Containers[schedulerIndex].Image = fmt.Sprintf("k8s.gcr.io/kube-scheduler:%s", tenantControlPlane.Spec.Kubernetes.Version) + podSpec.Containers[schedulerIndex].Image = fmt.Sprintf("registry.k8s.io/kube-scheduler:%s", tenantControlPlane.Spec.Kubernetes.Version) podSpec.Containers[schedulerIndex].Command = []string{"kube-scheduler"} podSpec.Containers[schedulerIndex].Args = utilities.ArgsFromMapToSlice(args) podSpec.Containers[schedulerIndex].VolumeMounts = []corev1.VolumeMount{ @@ -373,7 +373,7 @@ func (d *Deployment) buildControllerManager(podSpec *corev1.PodSpec, tenantContr args["--use-service-account-credentials"] = "true" podSpec.Containers[controllerManagerIndex].Name = "kube-controller-manager" - podSpec.Containers[controllerManagerIndex].Image = fmt.Sprintf("k8s.gcr.io/kube-controller-manager:%s", tenantControlPlane.Spec.Kubernetes.Version) + podSpec.Containers[controllerManagerIndex].Image = fmt.Sprintf("registry.k8s.io/kube-controller-manager:%s", tenantControlPlane.Spec.Kubernetes.Version) podSpec.Containers[controllerManagerIndex].Command = []string{"kube-controller-manager"} podSpec.Containers[controllerManagerIndex].Args = utilities.ArgsFromMapToSlice(args) podSpec.Containers[controllerManagerIndex].VolumeMounts = []corev1.VolumeMount{ @@ -461,7 +461,7 @@ func (d *Deployment) buildKubeAPIServer(podSpec *corev1.PodSpec, tenantControlPl podSpec.Containers[apiServerIndex].Name = "kube-apiserver" podSpec.Containers[apiServerIndex].Args = utilities.ArgsFromMapToSlice(args) - podSpec.Containers[apiServerIndex].Image = fmt.Sprintf("k8s.gcr.io/kube-apiserver:%s", tenantControlPlane.Spec.Kubernetes.Version) + podSpec.Containers[apiServerIndex].Image = fmt.Sprintf("registry.k8s.io/kube-apiserver:%s", tenantControlPlane.Spec.Kubernetes.Version) podSpec.Containers[apiServerIndex].Command = []string{"kube-apiserver"} podSpec.Containers[apiServerIndex].LivenessProbe = &corev1.Probe{ ProbeHandler: corev1.ProbeHandler{ diff --git a/internal/resources/addons/kube_proxy.go b/internal/resources/addons/kube_proxy.go index 49f2265..e4a0b82 100644 --- a/internal/resources/addons/kube_proxy.go +++ b/internal/resources/addons/kube_proxy.go @@ -360,7 +360,7 @@ func (k *KubeProxy) decodeManifests(ctx context.Context, tcp *kamajiv1alpha1.Ten if len(tcp.Spec.Addons.KubeProxy.ImageRepository) > 0 { config.Parameters.KubeProxyOptions.Repository = tcp.Spec.Addons.KubeProxy.ImageRepository } else { - config.Parameters.KubeProxyOptions.Repository = "k8s.gcr.io" + config.Parameters.KubeProxyOptions.Repository = "registry.k8s.io" } if len(tcp.Spec.Addons.KubeProxy.ImageTag) > 0 { diff --git a/internal/resources/kubeadm_utils.go b/internal/resources/kubeadm_utils.go index c1e3b05..04571b7 100644 --- a/internal/resources/kubeadm_utils.go +++ b/internal/resources/kubeadm_utils.go @@ -63,7 +63,7 @@ func GetKubeadmManifestDeps(ctx context.Context, client client.Client, tenantCon if len(kubeProxy.ImageRepository) > 0 { config.Parameters.KubeProxyOptions.Repository = kubeProxy.ImageRepository } else { - config.Parameters.KubeProxyOptions.Repository = "k8s.gcr.io" + config.Parameters.KubeProxyOptions.Repository = "registry.k8s.io" } if len(kubeProxy.ImageTag) > 0 {