diff --git a/multi-cluster/helm/templates/redis-master-deployment.yaml b/multi-cluster/helm/templates/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/multi-cluster/helm/templates/redis-master-deployment.yaml +++ b/multi-cluster/helm/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/multi-cluster/helm/templates/redis-slave-deployment.yaml b/multi-cluster/helm/templates/redis-slave-deployment.yaml index 0bb6020f..5c4397c7 100644 --- a/multi-cluster/helm/templates/redis-slave-deployment.yaml +++ b/multi-cluster/helm/templates/redis-slave-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/multi-cluster/kustomize/base/redis-master-deployment.yaml b/multi-cluster/kustomize/base/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/multi-cluster/kustomize/base/redis-master-deployment.yaml +++ b/multi-cluster/kustomize/base/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/multi-cluster/kustomize/base/redis-slave-deployment.yaml b/multi-cluster/kustomize/base/redis-slave-deployment.yaml index 30053601..0e941558 100644 --- a/multi-cluster/kustomize/base/redis-slave-deployment.yaml +++ b/multi-cluster/kustomize/base/redis-slave-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/redis-master-deployment.yaml b/multi-cluster/manifests/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/multi-cluster/manifests/redis-master-deployment.yaml +++ b/multi-cluster/manifests/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/redis-slave-deployment.yaml b/multi-cluster/manifests/redis-slave-deployment.yaml index 30053601..0e941558 100644 --- a/multi-cluster/manifests/redis-slave-deployment.yaml +++ b/multi-cluster/manifests/redis-slave-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/simple/redis-master-deployment.yaml b/simple/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/simple/redis-master-deployment.yaml +++ b/simple/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/simple/redis-slave-deployment.yaml b/simple/redis-slave-deployment.yaml index 30053601..0e941558 100644 --- a/simple/redis-slave-deployment.yaml +++ b/simple/redis-slave-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml index 0bb6020f..5c4397c7 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/helm/templates/redis-master-deployment.yaml b/single-cluster/helm/templates/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/single-cluster/helm/templates/redis-master-deployment.yaml +++ b/single-cluster/helm/templates/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/helm/templates/redis-slave-deployment.yaml b/single-cluster/helm/templates/redis-slave-deployment.yaml index 0bb6020f..5c4397c7 100644 --- a/single-cluster/helm/templates/redis-slave-deployment.yaml +++ b/single-cluster/helm/templates/redis-slave-deployment.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/kustomize/base/redis-master-deployment.yaml b/single-cluster/kustomize/base/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/single-cluster/kustomize/base/redis-master-deployment.yaml +++ b/single-cluster/kustomize/base/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/kustomize/base/redis-slave-deployment.yaml b/single-cluster/kustomize/base/redis-slave-deployment.yaml index 30053601..0e941558 100644 --- a/single-cluster/kustomize/base/redis-slave-deployment.yaml +++ b/single-cluster/kustomize/base/redis-slave-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/manifests/deployments/redis-master-deployment.yaml b/single-cluster/manifests/deployments/redis-master-deployment.yaml index d815405b..d675715a 100644 --- a/single-cluster/manifests/deployments/redis-master-deployment.yaml +++ b/single-cluster/manifests/deployments/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m diff --git a/single-cluster/manifests/deployments/redis-slave-deployment.yaml b/single-cluster/manifests/deployments/redis-slave-deployment.yaml index 30053601..0e941558 100644 --- a/single-cluster/manifests/deployments/redis-slave-deployment.yaml +++ b/single-cluster/manifests/deployments/redis-slave-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index e3d49142..c6ee0b2b 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -149,7 +149,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -197,7 +197,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/dev-output.yaml b/tests/expected/multi-cluster/helm/dev-output.yaml index f80580fa..fae860f9 100644 --- a/tests/expected/multi-cluster/helm/dev-output.yaml +++ b/tests/expected/multi-cluster/helm/dev-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml index b36f6f37..cef5363e 100644 --- a/tests/expected/multi-cluster/helm/prod-output.yaml +++ b/tests/expected/multi-cluster/helm/prod-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm/test-output.yaml b/tests/expected/multi-cluster/helm/test-output.yaml index 6b970deb..069d9dd8 100644 --- a/tests/expected/multi-cluster/helm/test-output.yaml +++ b/tests/expected/multi-cluster/helm/test-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index df9006de..8af3a91a 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -122,7 +122,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -169,7 +169,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/kustomize/dev-output.yaml b/tests/expected/multi-cluster/kustomize/dev-output.yaml index 15e3d749..8d73cee1 100644 --- a/tests/expected/multi-cluster/kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/prod-output.yaml b/tests/expected/multi-cluster/kustomize/prod-output.yaml index 15660f35..992c3c73 100644 --- a/tests/expected/multi-cluster/kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/test-output.yaml b/tests/expected/multi-cluster/kustomize/test-output.yaml index afcb5422..d4a266fe 100644 --- a/tests/expected/multi-cluster/kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/kustomize/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index cbadaf32..615b92a9 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -158,7 +158,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -205,7 +205,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/manifests/dev-output.yaml b/tests/expected/multi-cluster/manifests/dev-output.yaml index 71190572..e4239578 100644 --- a/tests/expected/multi-cluster/manifests/dev-output.yaml +++ b/tests/expected/multi-cluster/manifests/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml index 3d082031..d0effabd 100644 --- a/tests/expected/multi-cluster/manifests/prod-output.yaml +++ b/tests/expected/multi-cluster/manifests/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/test-output.yaml b/tests/expected/multi-cluster/manifests/test-output.yaml index 6807705d..f62e2cd6 100644 --- a/tests/expected/multi-cluster/manifests/test-output.yaml +++ b/tests/expected/multi-cluster/manifests/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml index 18d9dfed..6d98adbc 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -119,7 +119,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -167,7 +167,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index 302272ec..efa97bc3 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -138,7 +138,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -186,7 +186,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/dev-output.yaml b/tests/expected/single-cluster/helm/dev-output.yaml index 560d92d1..cb0ef544 100644 --- a/tests/expected/single-cluster/helm/dev-output.yaml +++ b/tests/expected/single-cluster/helm/dev-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm/prod-output.yaml b/tests/expected/single-cluster/helm/prod-output.yaml index 560d92d1..cb0ef544 100644 --- a/tests/expected/single-cluster/helm/prod-output.yaml +++ b/tests/expected/single-cluster/helm/prod-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm/test-output.yaml b/tests/expected/single-cluster/helm/test-output.yaml index 560d92d1..cb0ef544 100644 --- a/tests/expected/single-cluster/helm/test-output.yaml +++ b/tests/expected/single-cluster/helm/test-output.yaml @@ -117,7 +117,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index 8f4f4e9a..f06eb522 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -102,7 +102,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -149,7 +149,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/kustomize/dev-output.yaml b/tests/expected/single-cluster/kustomize/dev-output.yaml index dd9138c7..ee736026 100644 --- a/tests/expected/single-cluster/kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/kustomize/dev-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/prod-output.yaml b/tests/expected/single-cluster/kustomize/prod-output.yaml index dd9138c7..ee736026 100644 --- a/tests/expected/single-cluster/kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/kustomize/prod-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/test-output.yaml b/tests/expected/single-cluster/kustomize/test-output.yaml index dd9138c7..ee736026 100644 --- a/tests/expected/single-cluster/kustomize/test-output.yaml +++ b/tests/expected/single-cluster/kustomize/test-output.yaml @@ -74,7 +74,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/bundle.yaml b/tests/expected/single-cluster/manifests/bundle.yaml index d5cc23cd..01a92506 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -76,7 +76,7 @@ spec: spec: containers: - name: master - image: registry.k8s.io/redis:e2e + image: redis resources: requests: cpu: 100m @@ -105,7 +105,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: redis resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/manifests/dev-output.yaml b/tests/expected/single-cluster/manifests/dev-output.yaml index 92420d30..e1fb9d7f 100644 --- a/tests/expected/single-cluster/manifests/dev-output.yaml +++ b/tests/expected/single-cluster/manifests/dev-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/prod-output.yaml b/tests/expected/single-cluster/manifests/prod-output.yaml index 92420d30..e1fb9d7f 100644 --- a/tests/expected/single-cluster/manifests/prod-output.yaml +++ b/tests/expected/single-cluster/manifests/prod-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/test-output.yaml b/tests/expected/single-cluster/manifests/test-output.yaml index 92420d30..e1fb9d7f 100644 --- a/tests/expected/single-cluster/manifests/test-output.yaml +++ b/tests/expected/single-cluster/manifests/test-output.yaml @@ -54,7 +54,7 @@ spec: tier: backend spec: containers: - - image: registry.k8s.io/redis:e2e + - image: redis name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: redis name: slave ports: - containerPort: 6379