diff --git a/examples/docker-compose-v3.yaml b/examples/docker-compose-v3.yaml index 0400e2d9d..0ca5a075f 100644 --- 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 index 5f847a4f3..21e811489 100644 --- 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 index 5f847a4f3..21e811489 100644 --- 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 index 559d3dbf7..77ad63d01 100644 --- 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 index 49f5df073..4ec324fbd 100644 --- 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 index 13067c701..cc250e153 100644 --- 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 index 5689b3ecf..868b76a55 100644 --- 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 index b25c8feda..496c9743c 100644 --- 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 index 5689b3ecf..868b76a55 100644 --- 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 index b25c8feda..496c9743c 100644 --- 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 index d13923f78..722da898c 100644 --- 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 index 00b5bff62..db823828c 100644 --- 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 index 0400e2d9d..0ca5a075f 100644 --- 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 index 13b9869ca..f3b6d02fc 100644 --- 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 index 6784936f6..8ac8eedff 100644 --- 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 index ba064a5e9..ff1f6eab4 100644 --- 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 index 42c7e0e7f..38256be86 100644 --- 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 index a0b6d6a06..2ba8e75ba 100644 --- 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 index 7d8c4179d..7480ac561 100755 --- 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 }