Merge pull request #1210 from dgrisonnet/registry-0.6

[release-0.6] *: update registry location to registry.k8s.io
kubernetes-sigs · Mar 17, 2023 · 8ab5f9f · 8ab5f9f
2 parents 753007d + e900fc9
commit 8ab5f9f
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/FAQ.md b/FAQ.md
@@ -77,7 +77,7 @@ Suggested configuration:
 
 #### How to run metric-server on different architecture?
 
-Starting from `v0.3.7` docker image `k8s.gcr.io/metrics-server/metrics-server` should support multiple architectures via Manifests List.
+Starting from `v0.3.7` docker image `registry.k8s.io/metrics-server/metrics-server` should support multiple architectures via Manifests List.
 List of supported architectures: `amd64`, `arm`, `arm64`, `ppc64le`, `s390x`.
 
 #### What Kubernetes versions are supported?

diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ Most useful flags:
 You can get a full list of Metrics Server configuration flags by running:
 
 ```shell
-docker run --rm k8s.gcr.io/metrics-server/metrics-server:v0.6.2 --help
+docker run --rm registry.k8s.io/metrics-server/metrics-server:v0.6.2 --help
 ```
 
 ## Design

diff --git a/charts/metrics-server/README.md b/charts/metrics-server/README.md
@@ -24,7 +24,7 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
 
 | Parameter                            | Description                                                                                                                                                                                                                                                      | Default                                    |
 | ------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------ |
-| `image.repository`                   | Image repository.                                                                                                                                                                                                                                                | `k8s.gcr.io/metrics-server/metrics-server` |
+| `image.repository`                   | Image repository.                                                                                                                                                                                                                                                | `registry.k8s.io/metrics-server/metrics-server` |
 | `image.tag`                          | Image tag, will override the default tag derived from the chart app version.                                                                                                                                                                                     | `""`                                       |
 | `image.pullPolicy`                   | Image pull policy.                                                                                                                                                                                                                                               | `IfNotPresent`                             |
 | `imagePullSecrets`                   | Image pull secrets.                                                                                                                                                                                                                                              | `[]`                                       |

diff --git a/manifests/autoscale/patch.yaml b/manifests/autoscale/patch.yaml
@@ -13,7 +13,7 @@ spec:
           resources:
             $patch: delete
         - name: metrics-server-nanny
-          image: k8s.gcr.io/autoscaling/addon-resizer:1.8.14
+          image: registry.k8s.io/autoscaling/addon-resizer:1.8.14
           resources:
             limits:
               cpu: 40m

diff --git a/manifests/release/kustomization.yaml b/manifests/release/kustomization.yaml
@@ -4,6 +4,6 @@ bases:
   - ../base
 images:
   - name: gcr.io/k8s-staging-metrics-server/metrics-server
-    newName: k8s.gcr.io/metrics-server/metrics-server
+    newName: registry.k8s.io/metrics-server/metrics-server
     newTag: v0.6.2
 
diff --git a/manifests/test-ha/kustomization.yaml b/manifests/test-ha/kustomization.yaml
@@ -11,6 +11,6 @@ patchesJson6902:
     namespace: kube-system
   path: patch.yaml
 images:
-  - name: k8s.gcr.io/metrics-server/metrics-server
+  - name: registry.k8s.io/metrics-server/metrics-server
     newName: gcr.io/k8s-staging-metrics-server/metrics-server
     newTag: master
diff --git a/test/e2e_test.go b/test/e2e_test.go
@@ -490,7 +490,7 @@ func consumeCPU(client clientset.Interface, podName string) error {
 				Name:    podName,
 				Command: []string{"./consume-cpu/consume-cpu"},
 				Args:    []string{"--duration-sec=60", "--millicores=50"},
-				Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+				Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				Resources: corev1.ResourceRequirements{
 					Requests: map[corev1.ResourceName]resource.Quantity{
 						corev1.ResourceCPU: mustQuantity("100m"),
@@ -515,7 +515,7 @@ func consumeMemory(client clientset.Interface, podName string) error {
 				Name:    podName,
 				Command: []string{"stress"},
 				Args:    []string{"-m", "1", "--vm-bytes", "50M", "--vm-hang", "0", "-t", "60"},
-				Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+				Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				Resources: corev1.ResourceRequirements{
 					Requests: map[corev1.ResourceName]resource.Quantity{
 						corev1.ResourceMemory: mustQuantity("100Mi"),
@@ -539,7 +539,7 @@ func consumeWithInitContainer(client clientset.Interface, podName string) error
 				Name:    podName,
 				Command: []string{"./consume-cpu/consume-cpu"},
 				Args:    []string{"--duration-sec=60", "--millicores=50"},
-				Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+				Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				Resources: corev1.ResourceRequirements{
 					Requests: map[corev1.ResourceName]resource.Quantity{
 						corev1.ResourceCPU:    mustQuantity("100m"),
@@ -553,7 +553,7 @@ func consumeWithInitContainer(client clientset.Interface, podName string) error
 					Name:    "init-container",
 					Command: []string{"./consume-cpu/consume-cpu"},
 					Args:    []string{"--duration-sec=10", "--millicores=50"},
-					Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+					Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				},
 			}},
 	}
@@ -573,7 +573,7 @@ func consumeWithSideCarContainer(client clientset.Interface, podName string) err
 				Name:    podName,
 				Command: []string{"./consume-cpu/consume-cpu"},
 				Args:    []string{"--duration-sec=60", "--millicores=50"},
-				Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+				Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				Resources: corev1.ResourceRequirements{
 					Requests: map[corev1.ResourceName]resource.Quantity{
 						corev1.ResourceCPU:    mustQuantity("100m"),
@@ -585,7 +585,7 @@ func consumeWithSideCarContainer(client clientset.Interface, podName string) err
 				Name:    "sidecar-container",
 				Command: []string{"./consume-cpu/consume-cpu"},
 				Args:    []string{"--duration-sec=60", "--millicores=50"},
-				Image:   "k8s.gcr.io/e2e-test-images/resource-consumer:1.9",
+				Image:   "registry.k8s.io/e2e-test-images/resource-consumer:1.9",
 				Resources: corev1.ResourceRequirements{
 					Requests: map[corev1.ResourceName]resource.Quantity{
 						corev1.ResourceCPU:    mustQuantity("100m"),