Always use registry.k8s.io

Follow CAPZ change: kubernetes-sigs/cluster-api-provider-azure#2824
edreed · Mar 9, 2023 · 8a249dc · 8a249dc
1 parent 3b50d68
commit 8a249dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml b/tests/k8s-azure/manifest/cluster-api/linux-vmss-ci-version.yaml
@@ -159,10 +159,6 @@ spec:
               mv "$$CI_DIR/$$CI_PACKAGE" "/usr/bin/$$CI_PACKAGE"
             done
             IMAGE_REGISTRY_PREFIX=registry.k8s.io
-            # Kubernetes builds from 1.20 through 1.24 are tagged with k8s.gcr.io
-            if [[ "$${CI_VERSION}" =~ ^v1\.2[0-4][\.[0-9]+ ]]; then
-              IMAGE_REGISTRY_PREFIX=k8s.gcr.io
-            fi
             for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
               echo "* downloading package: $$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT"
               wget "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" -O "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
@@ -335,10 +331,6 @@ spec:
             mv "$$CI_DIR/$$CI_PACKAGE" "/usr/bin/$$CI_PACKAGE"
           done
           IMAGE_REGISTRY_PREFIX=registry.k8s.io
-          # Kubernetes builds from 1.20 through 1.24 are tagged with k8s.gcr.io
-          if [[ "$${CI_VERSION}" =~ ^v1\.2[0-4][\.[0-9]+ ]]; then
-            IMAGE_REGISTRY_PREFIX=k8s.gcr.io
-          fi
           for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
             echo "* downloading package: $$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT"
             wget "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" -O "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
@@ -5505,7 +5497,7 @@ data:
             - --kubelet-use-node-status-port
             - --metric-resolution=15s
             - --kubelet-insecure-tls
-            image: k8s.gcr.io/metrics-server/metrics-server:v0.5.2
+            image: registry.k8s.io/metrics-server/metrics-server:v0.5.2
             imagePullPolicy: IfNotPresent
             livenessProbe:
               failureThreshold: 3

diff --git a/tests/k8s-azure/manifest/cluster-api/linux-vmss-multiple-zones-ci-version.yaml b/tests/k8s-azure/manifest/cluster-api/linux-vmss-multiple-zones-ci-version.yaml
@@ -159,10 +159,6 @@ spec:
               mv "$$CI_DIR/$$CI_PACKAGE" "/usr/bin/$$CI_PACKAGE"
             done
             IMAGE_REGISTRY_PREFIX=registry.k8s.io
-            # Kubernetes builds from 1.20 through 1.24 are tagged with k8s.gcr.io
-            if [[ "$${CI_VERSION}" =~ ^v1\.2[0-4][\.[0-9]+ ]]; then
-              IMAGE_REGISTRY_PREFIX=k8s.gcr.io
-            fi
             for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
               echo "* downloading package: $$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT"
               wget "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" -O "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
@@ -338,10 +334,6 @@ spec:
             mv "$$CI_DIR/$$CI_PACKAGE" "/usr/bin/$$CI_PACKAGE"
           done
           IMAGE_REGISTRY_PREFIX=registry.k8s.io
-          # Kubernetes builds from 1.20 through 1.24 are tagged with k8s.gcr.io
-          if [[ "$${CI_VERSION}" =~ ^v1\.2[0-4][\.[0-9]+ ]]; then
-            IMAGE_REGISTRY_PREFIX=k8s.gcr.io
-          fi
           for CI_CONTAINER in "$${CONTAINERS_TO_TEST[@]}"; do
             echo "* downloading package: $$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT"
             wget "$$CI_URL/$$CI_CONTAINER.$$CONTAINER_EXT" -O "$$CI_DIR/$$CI_CONTAINER.$$CONTAINER_EXT"
@@ -5511,7 +5503,7 @@ data:
             - --kubelet-use-node-status-port
             - --metric-resolution=15s
             - --kubelet-insecure-tls
-            image: k8s.gcr.io/metrics-server/metrics-server:v0.5.2
+            image: registry.k8s.io/metrics-server/metrics-server:v0.5.2
             imagePullPolicy: IfNotPresent
             livenessProbe:
               failureThreshold: 3