Revert k8s.gcr.io vanity domain

This reverts commit eba5b6092a. Fixes https://github.com/kubernetes/kubernetes/issues/57526
2025-09-10 05:30:26 +00:00 · 2017-12-22 14:36:16 -08:00
parent 475d5c32e8
commit e9dd8a68f6
233 changed files with 470 additions and 486 deletions
--- a/hack/testdata/deployment-multicontainer-resources.yaml
+++ b/hack/testdata/deployment-multicontainer-resources.yaml
@@ -16,9 +16,9 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:test-cmd
+        image: gcr.io/google-containers/nginx:test-cmd
        ports:
        - containerPort: 80
      - name: perl
-        image: k8s.gcr.io/perl
+        image: gcr.io/google-containers/perl
      terminationGracePeriodSeconds: 0
--- a/hack/testdata/deployment-multicontainer.yaml
+++ b/hack/testdata/deployment-multicontainer.yaml
@@ -16,8 +16,8 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:test-cmd
+        image: gcr.io/google-containers/nginx:test-cmd
        ports:
        - containerPort: 80
      - name: perl
-        image: k8s.gcr.io/perl
+        image: gcr.io/google-containers/perl
--- a/hack/testdata/deployment-revision1.yaml
+++ b/hack/testdata/deployment-revision1.yaml
@@ -16,6 +16,6 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:test-cmd
+        image: gcr.io/google-containers/nginx:test-cmd
        ports:
        - containerPort: 80
--- a/hack/testdata/deployment-revision2.yaml
+++ b/hack/testdata/deployment-revision2.yaml
@@ -16,6 +16,6 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
        ports:
        - containerPort: 80
--- a/hack/testdata/filter/pod-apply-selector.yaml
+++ b/hack/testdata/filter/pod-apply-selector.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/filter/pod-dont-apply.yaml
+++ b/hack/testdata/filter/pod-dont-apply.yaml
@@ -8,4 +8,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/multi-resource-json-modify.json
+++ b/hack/testdata/multi-resource-json-modify.json
@@ -43,7 +43,7 @@
       "spec":{
         "containers":[{
           "name": "mock-container",
-           "image": "k8s.gcr.io/pause:2.0",
+           "image": "gcr.io/google-containers/pause:2.0",
           "ports":[{
             "containerPort":9949,
             "protocol":"TCP"
--- a/hack/testdata/multi-resource-json.json
+++ b/hack/testdata/multi-resource-json.json
@@ -41,7 +41,7 @@
       "spec":{
         "containers":[{
           "name": "mock-container",
-           "image": "k8s.gcr.io/pause:2.0",
+           "image": "gcr.io/google-containers/pause:2.0",
           "ports":[{
             "containerPort":9949,
             "protocol":"TCP"
--- a/hack/testdata/multi-resource-list-modify.json
+++ b/hack/testdata/multi-resource-list-modify.json
@@ -47,7 +47,7 @@
               "spec":{
                  "containers":[{
                    "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:2.0",
+                    "image": "gcr.io/google-containers/pause:2.0",
                    "ports":[{
                        "containerPort":9949,
                        "protocol":"TCP"
--- a/hack/testdata/multi-resource-list.json
+++ b/hack/testdata/multi-resource-list.json
@@ -45,7 +45,7 @@
               "spec":{
                  "containers":[{
                    "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:2.0",
+                    "image": "gcr.io/google-containers/pause:2.0",
                    "ports":[{
                        "containerPort":9949,
                        "protocol":"TCP"
--- a/hack/testdata/multi-resource-rclist-modify.json
+++ b/hack/testdata/multi-resource-rclist-modify.json
@@ -26,7 +26,7 @@
               "spec":{
                  "containers":[{
                    "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:2.0",
+                    "image": "gcr.io/google-containers/pause:2.0",
                    "ports":[{
                        "containerPort":9949,
                        "protocol":"TCP"
@@ -60,7 +60,7 @@
            "spec":{
              "containers":[{
                "name": "mock-container",
-                "image": "k8s.gcr.io/pause:2.0",
+                "image": "gcr.io/google-containers/pause:2.0",
                "ports":[{
                  "containerPort":9949,
                  "protocol":"TCP"
--- a/hack/testdata/multi-resource-rclist.json
+++ b/hack/testdata/multi-resource-rclist.json
@@ -26,7 +26,7 @@
               "spec":{
                  "containers":[{
                    "name": "mock-container",
-                    "image": "k8s.gcr.io/pause:2.0",
+                    "image": "gcr.io/google-containers/pause:2.0",
                    "ports":[{
                        "containerPort":9949,
                        "protocol":"TCP"
@@ -60,7 +60,7 @@
            "spec":{
              "containers":[{
                "name": "mock-container",
-                "image": "k8s.gcr.io/pause:2.0",
+                "image": "gcr.io/google-containers/pause:2.0",
                "ports":[{
                  "containerPort":9949,
                  "protocol":"TCP"
--- a/hack/testdata/multi-resource-yaml-modify.yaml
+++ b/hack/testdata/multi-resource-yaml-modify.yaml
@@ -29,7 +29,7 @@ spec:
    spec:
      containers:
      - name: mock-container
-        image: k8s.gcr.io/pause:2.0
+        image: gcr.io/google-containers/pause:2.0
        ports:
        - containerPort: 9949
          protocol: TCP
--- a/hack/testdata/multi-resource-yaml.yaml
+++ b/hack/testdata/multi-resource-yaml.yaml
@@ -27,7 +27,7 @@ spec:
    spec:
      containers:
      - name: mock-container
-        image: k8s.gcr.io/pause:2.0
+        image: gcr.io/google-containers/pause:2.0
        ports:
        - containerPort: 9949
          protocol: TCP
--- a/hack/testdata/null-propagation/deployment-l1.yaml
+++ b/hack/testdata/null-propagation/deployment-l1.yaml
@@ -10,4 +10,4 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
--- a/hack/testdata/null-propagation/deployment-l2.yaml
+++ b/hack/testdata/null-propagation/deployment-l2.yaml
@@ -14,5 +14,5 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
        terminationMessagePolicy: null
--- a/hack/testdata/pod-apply.yaml
+++ b/hack/testdata/pod-apply.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/pod-with-api-env.yaml
+++ b/hack/testdata/pod-with-api-env.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
  containers:
    - name: test-container
-      image: k8s.gcr.io/busybox
+      image: gcr.io/google_containers/busybox
      command: [ "/bin/sh", "-c", "env" ]
      env:
        - name: TEST_CMD_1
--- a/hack/testdata/pod-with-precision.json
+++ b/hack/testdata/pod-with-precision.json
@@ -9,7 +9,7 @@
      "containers": [
        {
          "name": "kubernetes-pause",
-          "image": "k8s.gcr.io/pause-amd64:3.0"
+          "image": "gcr.io/google_containers/pause-amd64:3.0"
        }
      ],
      "restartPolicy": "Never",
--- a/hack/testdata/pod.yaml
+++ b/hack/testdata/pod.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/prune/a.yaml
+++ b/hack/testdata/prune/a.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/prune/b.yaml
+++ b/hack/testdata/prune/b.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml
+++ b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml
@@ -13,6 +13,6 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
        ports:
        - containerPort: 80
--- a/hack/testdata/recursive/deployment/deployment/nginx.yaml
+++ b/hack/testdata/recursive/deployment/deployment/nginx.yaml
@@ -13,6 +13,6 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
        ports:
        - containerPort: 80
--- a/hack/testdata/recursive/deployment/nginx.yaml
+++ b/hack/testdata/recursive/deployment/nginx.yaml
@@ -13,6 +13,6 @@ spec:
    spec:
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx:1.7.9
+        image: gcr.io/google-containers/nginx:1.7.9
        ports:
        - containerPort: 80
--- a/hack/testdata/rollingupdate-daemonset-rv2.yaml
+++ b/hack/testdata/rollingupdate-daemonset-rv2.yaml
@@ -24,6 +24,6 @@ spec:
              namespaces: []
      containers:
      - name: kubernetes-pause
-        image: k8s.gcr.io/pause:latest
+        image: gcr.io/google-containers/pause:latest
      - name: app
-        image: k8s.gcr.io/nginx:test-cmd
+        image: gcr.io/google-containers/nginx:test-cmd
--- a/hack/testdata/rollingupdate-daemonset.yaml
+++ b/hack/testdata/rollingupdate-daemonset.yaml
@@ -24,4 +24,4 @@ spec:
              namespaces: []
      containers:
      - name: kubernetes-pause
-        image: k8s.gcr.io/pause:2.0
+        image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/rollingupdate-statefulset-rv2.yaml
+++ b/hack/testdata/rollingupdate-statefulset-rv2.yaml
@@ -18,7 +18,7 @@ spec:
      terminationGracePeriodSeconds: 5
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx-slim:0.8
+        image: gcr.io/google_containers/nginx-slim:0.8
        ports:
        - containerPort: 80
          name: web
@@ -27,7 +27,7 @@ spec:
        - -c
        - 'while true; do sleep 1; done'
      - name: pause
-        image: k8s.gcr.io/pause:2.0
+        image: gcr.io/google-containers/pause:2.0
        ports:
        - containerPort: 81
          name: web-2
--- a/hack/testdata/rollingupdate-statefulset.yaml
+++ b/hack/testdata/rollingupdate-statefulset.yaml
@@ -18,7 +18,7 @@ spec:
      terminationGracePeriodSeconds: 5
      containers:
      - name: nginx
-        image: k8s.gcr.io/nginx-slim:0.7
+        image: gcr.io/google_containers/nginx-slim:0.7
        ports:
        - containerPort: 80
          name: web
--- a/hack/testdata/sorted-pods/sorted-pod1.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod1.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/sorted-pods/sorted-pod2.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod2.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0
--- a/hack/testdata/sorted-pods/sorted-pod3.yaml
+++ b/hack/testdata/sorted-pods/sorted-pod3.yaml
@@ -7,4 +7,4 @@ metadata:
 spec:
  containers:
  - name: kubernetes-pause
-    image: k8s.gcr.io/pause:2.0
+    image: gcr.io/google-containers/pause:2.0