Merge pull request #28985 from BenTheElder/registryk8siocleanup

cleanup k8s.gcr.io references
kubernetes · Mar 10, 2023 · 7bb3c7b · 7bb3c7b
2 parents c8847b6 + 04a8338
commit 7bb3c7b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml b/config/jobs/kubernetes/sig-cluster-lifecycle/manifests.yaml
@@ -18,7 +18,7 @@ periodics:
     testgrid-dashboards: sig-cluster-lifecycle-all
     testgrid-tab-name: periodic-manifest-lists
     testgrid-alert-email: kubernetes-sig-cluster-lifecycle+testgrid@googlegroups.com
-    description: "OWNER: sig-cluster-lifecycle; an e2e test for verifying manifest list images at k8s.gcr.io"
+    description: "OWNER: sig-cluster-lifecycle; an e2e test for verifying manifest list images at registry.k8s.io"
     testgrid-num-columns-recent: "20"
     testgrid-num-failures-to-alert: "4"
     testgrid-alert-stale-results-hours: "48"
diff --git a/config/prow/autobump-config/prow-job-autobump-config.yaml b/config/prow/autobump-config/prow-job-autobump-config.yaml
@@ -34,8 +34,3 @@ prefixes:
     repo: "https://github.com/kubernetes/test-infra"
     summarise: false
     consistentImages: false
-  - name: "test-infra images"
-    prefix: "k8s.gcr.io/test-infra"
-    repo: "https://github.com/kubernetes/test-infra"
-    summarise: false
-    consistentImages: false
diff --git a/experiment/kind-conformance-image-e2e.sh b/experiment/kind-conformance-image-e2e.sh
@@ -142,8 +142,7 @@ run_tests() {
 
   # build and load the conformance image into the kind nodes
   make build ARCH=amd64
-  kind load docker-image k8s.gcr.io/conformance-amd64:${VERSION} ||
-      kind load docker-image registry.k8s.io/conformance-amd64:${VERSION}
+  kind load docker-image registry.k8s.io/conformance-amd64:${VERSION}
 
   # patch the image in manifest
   sed -i "s|conformance-amd64:.*|conformance-amd64:${VERSION}|g" conformance-e2e.yaml