Merge pull request #901 from thockin-tmp/gcr-vanity

Convert registry to k8s.gcr.io
kubernetes · Jan 2, 2018 · d19d7a6 · d19d7a6
2 parents f66ba3c + a178cf5
commit d19d7a6
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 20 deletions.
diff --git a/examples/docker-compose-v3.yaml b/examples/docker-compose-v3.yaml
@@ -3,7 +3,7 @@ version: "3"
 services:
 
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
 

diff --git a/examples/docker-compose.yaml b/examples/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "2"
 services:
 
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
 

diff --git a/script/test/fixtures/controller/docker-compose.yml b/script/test/fixtures/controller/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2"
 services:
 
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
 

diff --git a/script/test/fixtures/controller/output-k8s-daemonset-template.json b/script/test/fixtures/controller/output-k8s-daemonset-template.json
@@ -174,7 +174,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/controller/output-k8s-deployment-template.json b/script/test/fixtures/controller/output-k8s-deployment-template.json
@@ -173,7 +173,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/controller/output-k8s-rc-template.json b/script/test/fixtures/controller/output-k8s-rc-template.json
@@ -173,7 +173,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/examples/output-k8s.json b/script/test/fixtures/examples/output-k8s.json
@@ -172,7 +172,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/examples/output-os.json b/script/test/fixtures/examples/output-os.json
@@ -281,7 +281,7 @@
             "annotations": null,
             "from": {
               "kind": "DockerImage",
-              "name": "gcr.io/google_containers/redis:e2e"
+              "name": "k8s.gcr.io/redis:e2e"
             },
             "generation": null,
             "importPolicy": {}

diff --git a/script/test/fixtures/examples/output-v3-k8s.json b/script/test/fixtures/examples/output-v3-k8s.json
@@ -172,7 +172,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/examples/output-v3-os.json b/script/test/fixtures/examples/output-v3-os.json
@@ -281,7 +281,7 @@
             "annotations": null,
             "from": {
               "kind": "DockerImage",
-              "name": "gcr.io/google_containers/redis:e2e"
+              "name": "k8s.gcr.io/redis:e2e"
             },
             "generation": null,
             "importPolicy": {}

diff --git a/script/test/fixtures/keyonly-envs/env.yml b/script/test/fixtures/keyonly-envs/env.yml
@@ -2,7 +2,7 @@ version: "2"
 
 services:
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
   redis-slave:

diff --git a/script/test/fixtures/keyonly-envs/output-k8s-template.json b/script/test/fixtures/keyonly-envs/output-k8s-template.json
@@ -181,7 +181,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/v3/docker-compose.yaml b/script/test/fixtures/v3/docker-compose.yaml
@@ -3,7 +3,7 @@ version: "3"
 services:
 
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
 

diff --git a/script/test/fixtures/v3/output-k8s-template.json b/script/test/fixtures/v3/output-k8s-template.json
@@ -172,7 +172,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/v3/output-os-template.json b/script/test/fixtures/v3/output-os-template.json
@@ -281,7 +281,7 @@
             "annotations": null,
             "from": {
               "kind": "DockerImage",
-              "name": "gcr.io/google_containers/redis:e2e"
+              "name": "k8s.gcr.io/redis:e2e"
             },
             "generation": null,
             "importPolicy": {}

diff --git a/script/test/fixtures/volume-mounts/tmpfs/docker-compose.yml b/script/test/fixtures/volume-mounts/tmpfs/docker-compose.yml
@@ -3,7 +3,7 @@ version: "2"
 services:
 
   redis-master:
-    image: gcr.io/google_containers/redis:e2e 
+    image: k8s.gcr.io/redis:e2e 
     ports:
       - "6379"
     tmpfs:

diff --git a/script/test/fixtures/volume-mounts/tmpfs/output-k8s-template.json b/script/test/fixtures/volume-mounts/tmpfs/output-k8s-template.json
@@ -68,7 +68,7 @@
             "containers": [
               {
                 "name": "redis-master",
-                "image": "gcr.io/google_containers/redis:e2e",
+                "image": "k8s.gcr.io/redis:e2e",
                 "ports": [
                   {
                     "containerPort": 6379

diff --git a/script/test/fixtures/volume-mounts/tmpfs/output-os-template.json b/script/test/fixtures/volume-mounts/tmpfs/output-os-template.json
@@ -131,7 +131,7 @@
             "annotations": null,
             "from": {
               "kind": "DockerImage",
-              "name": "gcr.io/google_containers/redis:e2e"
+              "name": "k8s.gcr.io/redis:e2e"
             },
             "generation": null,
             "importPolicy": {}

diff --git a/script/test_k8s/kubernetes.sh b/script/test_k8s/kubernetes.sh
@@ -67,13 +67,13 @@ stop_k8s() {
   "
   docker rm -f minikube
 
-  # Delete via image name google_containers
+  # Delete via image name k8s.gcr.io
   # Delete all containers started (names start with k8s_)
   # Run twice in-case a container is replicated during that time
   for run in {0..2}
   do
     docker ps -a | grep 'k8s_' | awk '{print $1}' | xargs --no-run-if-empty docker rm -f
-    docker ps -a | grep 'gcr.io/google_containers/hyperkube-amd64' | awk '{print $1}' | xargs --no-run-if-empty docker rm -f
+    docker ps -a | grep 'k8s.gcr.io/hyperkube-amd64' | awk '{print $1}' | xargs --no-run-if-empty docker rm -f
   done
 }