deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

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

Browse Source 
Convert registry to k8s.gcr.io
This commit is contained in:
Charlie Drage 2018-01-02 15:34:25 -05:00 committed by GitHub
commit d19d7a63b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/docker-compose-v3.yaml
View File

@ -3,7 +3,7 @@ version: "3"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"

2
examples/docker-compose.yaml
View File

@ -3,7 +3,7 @@ version: "2"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"

2
script/test/fixtures/controller/docker-compose.yml vendored
View File

@ -3,7 +3,7 @@ version: "2"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"

2
script/test/fixtures/controller/output-k8s-daemonset-template.json vendored
View File

@ -174,7 +174,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/controller/output-k8s-deployment-template.json vendored
View File

@ -173,7 +173,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/controller/output-k8s-rc-template.json vendored
View File

@ -173,7 +173,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/examples/output-k8s.json vendored
View File

@ -172,7 +172,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/examples/output-os.json vendored
View File

@ -281,7 +281,7 @@
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
"name": "gcr.io/google_containers/redis:e2e" "name": "k8s.gcr.io/redis:e2e"
}, },
"generation": null, "generation": null,
"importPolicy": {} "importPolicy": {}

2
script/test/fixtures/examples/output-v3-k8s.json vendored
View File

@ -172,7 +172,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/examples/output-v3-os.json vendored
View File

@ -281,7 +281,7 @@
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
"name": "gcr.io/google_containers/redis:e2e" "name": "k8s.gcr.io/redis:e2e"
}, },
"generation": null, "generation": null,
"importPolicy": {} "importPolicy": {}

2
script/test/fixtures/keyonly-envs/env.yml vendored
View File

@ -2,7 +2,7 @@ version: "2"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"
redis-slave: redis-slave:

2
script/test/fixtures/keyonly-envs/output-k8s-template.json vendored
View File

@ -181,7 +181,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/v3/docker-compose.yaml vendored
View File

@ -3,7 +3,7 @@ version: "3"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"

2
script/test/fixtures/v3/output-k8s-template.json vendored
View File

@ -172,7 +172,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/v3/output-os-template.json vendored
View File

@ -281,7 +281,7 @@
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
"name": "gcr.io/google_containers/redis:e2e" "name": "k8s.gcr.io/redis:e2e"
}, },
"generation": null, "generation": null,
"importPolicy": {} "importPolicy": {}

2
script/test/fixtures/volume-mounts/tmpfs/docker-compose.yml vendored
View File

@ -3,7 +3,7 @@ version: "2"
services: services:
redis-master: redis-master:
image: gcr.io/google_containers/redis:e2e image: k8s.gcr.io/redis:e2e
ports: ports:
- "6379" - "6379"
tmpfs: tmpfs:

2
script/test/fixtures/volume-mounts/tmpfs/output-k8s-template.json vendored
View File

@ -68,7 +68,7 @@
"containers": [ "containers": [
{ {
"name": "redis-master", "name": "redis-master",
"image": "gcr.io/google_containers/redis:e2e", "image": "k8s.gcr.io/redis:e2e",
"ports": [ "ports": [
{ {
"containerPort": 6379 "containerPort": 6379

2
script/test/fixtures/volume-mounts/tmpfs/output-os-template.json vendored
View File

@ -131,7 +131,7 @@
"annotations": null, "annotations": null,
"from": { "from": {
"kind": "DockerImage", "kind": "DockerImage",
"name": "gcr.io/google_containers/redis:e2e" "name": "k8s.gcr.io/redis:e2e"
}, },
"generation": null, "generation": null,
"importPolicy": {} "importPolicy": {}

4
script/test_k8s/kubernetes.sh
View File

@ -67,13 +67,13 @@ stop_k8s() {
" "
docker rm -f minikube 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_) # Delete all containers started (names start with k8s_)
# Run twice in-case a container is replicated during that time # Run twice in-case a container is replicated during that time
for run in {0..2} for run in {0..2}
do do
docker ps -a | grep 'k8s_' | awk '{print $1}' | xargs --no-run-if-empty docker rm -f 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 done
} }