Merge pull request #7410 from oscr/change-registry

🌱 Change registry from k8s.gcr.io to registry.k8s.io

Author: k8s-ci-robot

Makefile

@@ -171,7 +171,7 @@ GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN))
 
 # Define Docker related variables. Releases should modify and double check these vars.
 REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
-PROD_REGISTRY ?= k8s.gcr.io/cluster-api
+PROD_REGISTRY ?= registry.k8s.io/cluster-api
 
 STAGING_REGISTRY ?= gcr.io/k8s-staging-cluster-api
 STAGING_BUCKET ?= artifacts.k8s-staging-cluster-api.appspot.com

cmd/clusterctl/client/init_test.go

@@ -81,7 +81,7 @@ func Test_clusterctlClient_InitImages(t *testing.T) {
 				kubeconfigContext:      "mgmt-context",
 			},
 			expectedImages: []string{
-				"k8s.gcr.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3",
+				"registry.k8s.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3",
 			},
 			wantErr: false,
 		},
@@ -854,7 +854,7 @@ spec:
   template:
     spec:
       containers:
-      - image: k8s.gcr.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3
+      - image: registry.k8s.io/cluster-api-aws/cluster-api-aws-controller:v0.5.3
         name: manager
         volumeMounts:
         - mountPath: /home/.aws

controlplane/kubeadm/api/v1beta1/kubeadm_control_plane_webhook_test.go

@@ -298,7 +298,7 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 					ClusterName: "test",
 					DNS: bootstrapv1.DNS{
 						ImageMeta: bootstrapv1.ImageMeta{
-							ImageRepository: "k8s.gcr.io/coredns",
+							ImageRepository: "registry.k8s.io/coredns",
 							ImageTag:        "1.6.5",
 						},
 					},

controlplane/kubeadm/internal/controllers/controller_test.go

@@ -1039,7 +1039,7 @@ func TestReconcileInitializeControlPlane(t *testing.T) {
 			"ClusterConfiguration": `apiServer:
 dns:
   type: CoreDNS
-imageRepository: k8s.gcr.io
+imageRepository: registry.k8s.io
 kind: ClusterConfiguration
 kubernetesVersion: metav1.16.1`,
 		},
@@ -1057,7 +1057,7 @@ kubernetesVersion: metav1.16.1`,
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{
 						Name:  "coredns",
-						Image: "k8s.gcr.io/coredns:1.6.2",
+						Image: "registry.k8s.io/coredns:1.6.2",
 					}},
 				},
 			},
@@ -1163,7 +1163,7 @@ func TestKubeadmControlPlaneReconciler_updateCoreDNS(t *testing.T) {
 				ClusterConfiguration: &bootstrapv1.ClusterConfiguration{
 					DNS: bootstrapv1.DNS{
 						ImageMeta: bootstrapv1.ImageMeta{
-							ImageRepository: "k8s.gcr.io",
+							ImageRepository: "registry.k8s.io",
 							ImageTag:        "1.7.2",
 						},
 					},
@@ -1184,7 +1184,7 @@ func TestKubeadmControlPlaneReconciler_updateCoreDNS(t *testing.T) {
 				Spec: corev1.PodSpec{
 					Containers: []corev1.Container{{
 						Name:  "coredns",
-						Image: "k8s.gcr.io/coredns:1.6.2",
+						Image: "registry.k8s.io/coredns:1.6.2",
 					}},
 					Volumes: []corev1.Volume{{
 						Name: "config-volume",
@@ -1224,7 +1224,7 @@ func TestKubeadmControlPlaneReconciler_updateCoreDNS(t *testing.T) {
 			"ClusterConfiguration": `apiServer:
 dns:
   type: CoreDNS
-imageRepository: k8s.gcr.io
+imageRepository: registry.k8s.io
 kind: ClusterConfiguration
 kubernetesVersion: metav1.16.1`,
 		},
@@ -1282,7 +1282,7 @@ kubernetesVersion: metav1.16.1`,
 		}
 		var actualCoreDNSDeployment appsv1.Deployment
 		g.Expect(fakeClient.Get(ctx, client.ObjectKey{Name: "coredns", Namespace: metav1.NamespaceSystem}, &actualCoreDNSDeployment)).To(Succeed())
-		g.Expect(actualCoreDNSDeployment.Spec.Template.Spec.Containers[0].Image).To(Equal("k8s.gcr.io/coredns:1.7.2"))
+		g.Expect(actualCoreDNSDeployment.Spec.Template.Spec.Containers[0].Image).To(Equal("registry.k8s.io/coredns:1.7.2"))
 		g.Expect(actualCoreDNSDeployment.Spec.Template.Spec.Volumes).To(ConsistOf(expectedVolume))
 	})
 

controlplane/kubeadm/internal/webhooks/scale_test.go

@@ -85,7 +85,7 @@ func TestKubeadmControlPlaneValidateScale(t *testing.T) {
 					ClusterName: "kcp-managed-etcd",
 					DNS: bootstrapv1.DNS{
 						ImageMeta: bootstrapv1.ImageMeta{
-							ImageRepository: "k8s.gcr.io/coredns",
+							ImageRepository: "registry.k8s.io/coredns",
 							ImageTag:        "1.6.5",
 						},
 					},

controlplane/kubeadm/internal/workload_cluster_coredns.go

@@ -231,7 +231,9 @@ func (w *Workload) getCoreDNSInfo(ctx context.Context, clusterConfig *bootstrapv
 		return nil, err
 	}
 
-	// Handle the renaming of the upstream image from "k8s.gcr.io/coredns" to "k8s.gcr.io/coredns/coredns"
+	// Handle the renaming of the upstream image from:
+	// * "registry.k8s.io/coredns" to "registry.k8s.io/coredns/coredns" or
+	// * "k8s.gcr.io/coredns" to "k8s.gcr.io/coredns/coredns"
 	toImageName := parsedImage.Name
 	if (toImageRepository == oldKubernetesImageRepository || toImageRepository == kubernetesImageRepository) &&
 		toImageName == oldCoreDNSImageName && targetMajorMinorPatch.GTE(semver.MustParse("1.8.0")) {

docs/book/src/developer/providers/v1.2-to-v1.3.md

@@ -64,3 +64,4 @@ The default value is 0, meaning that the volume can be detached without any time
   The variable `SkipUpgrade` could be set to revert to the old behaviour by making use of the `KUBERNETES_VERSION` variable and skipping the kubernetes upgrade.
 - cert-manager upgraded from v1.9.1 to v1.10.0.
 - Machine `providerID` is now being strictly checked for equality when compared against Kubernetes node `providerID` data. This is the expected criteria for correlating a Cluster API machine to its corresponding Kubernetes node, but historically this comparison was not strict, and instead compared only against the `ID` substring part of the full `providerID` string. Because different providers construct `providerID` strings differently, the `ID` substring is not uniformly defined and implemented across providers, and thus the existing `providerID` equality can not guarantee the correct Machine-Node correlation. It is very unlikely that this new behavior will break existing providers, but FYI: if strict `providerID` equality will degrade expected behaviors, you may need to update your provider implementation prior to adopting Cluster API v1.3.
+- Default registry has changed. From now on new images will be published to `registry.k8s.io` instead of `k8s.gcr.io`.

docs/book/src/tasks/experimental-features/cluster-class/operate-cluster.md

@@ -199,7 +199,7 @@ Running the patch makes the following change to the Cluster yaml:
      topology:
        variables:
        - name: imageRepository
-         value: k8s.gcr.io
+         value: registry.k8s.io
        - name: etcdImageTag
          value: ""
        - name: coreDNSImageTag

docs/book/src/tasks/experimental-features/cluster-class/write-clusterclass.md

@@ -206,8 +206,8 @@ spec:
       openAPIV3Schema:
         type: string
         description: ImageRepository is the container registry to pull images from.
-        default: k8s.gcr.io
-        example: k8s.gcr.io
+        default: registry.k8s.io
+        example: registry.k8s.io
 ```
 
 <aside class="note">

docs/developer/releasing.md

@@ -12,7 +12,7 @@
    - `git push origin ${RELEASE_TAG}`
    - `git push origin test/${RELEASE_TAG}`
 
-## Promote images from the staging repo to `k8s.gcr.io/cluster-api`
+## Promote images from the staging repo to `registry.k8s.io/cluster-api`
 
 Images are built by the [post push images job](https://testgrid.k8s.io/sig-cluster-lifecycle-image-pushes#post-cluster-api-push-images). This will push the image to a [staging repository](https://console.cloud.google.com/gcr/images/k8s-staging-cluster-api).