From e5a81ac5f40de33a8b13e9c4399237e95c16cc0f Mon Sep 17 00:00:00 2001 From: Silvio Moioli Date: Mon, 16 May 2022 13:54:05 +0200 Subject: [PATCH 1/4] Update Redis slave image The old image required the `vsyscall=emulate` kernel parameter to work correctly because of an old glibc version which is incompatible with newer kernels. This fails with Rancher Desktop for example. Details at: https://github.com/rancher-sandbox/rancher-desktop/issues/2215 --- simple/redis-slave-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple/redis-slave-deployment.yaml b/simple/redis-slave-deployment.yaml index dfdcd00..3005360 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 resources: requests: cpu: 100m From 77deaaf776b1a0ca3a35778af0cfa6e2cfbaf77d Mon Sep 17 00:00:00 2001 From: Silvio Moioli Date: Mon, 16 May 2022 14:16:07 +0200 Subject: [PATCH 2/4] Bump redis container version Signed-off-by: Silvio Moioli --- simple/redis-master-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simple/redis-master-deployment.yaml b/simple/redis-master-deployment.yaml index d675715..fd9b2f5 100644 --- a/simple/redis-master-deployment.yaml +++ b/simple/redis-master-deployment.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m From 100dac8bc2f7e72f4cc43b95abf8ac9972634e9b Mon Sep 17 00:00:00 2001 From: Silvio Moioli Date: Mon, 16 May 2022 14:56:02 +0200 Subject: [PATCH 3/4] Fix multi-cluster examples Signed-off-by: Silvio Moioli --- multi-cluster/helm/templates/redis-master-deployment.yaml | 2 +- multi-cluster/helm/templates/redis-slave-deployment.yaml | 2 +- multi-cluster/kustomize/base/redis-master-deployment.yaml | 2 +- multi-cluster/kustomize/base/redis-slave-deployment.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/multi-cluster/helm/templates/redis-master-deployment.yaml b/multi-cluster/helm/templates/redis-master-deployment.yaml index d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 aed1759..0bb6020 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 dfdcd00..3005360 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 resources: requests: cpu: 100m From e8da7b655795f7f677cc921a76fa3847cbdefe16 Mon Sep 17 00:00:00 2001 From: Silvio Moioli Date: Mon, 23 May 2022 13:11:54 +0200 Subject: [PATCH 4/4] Align all examples to the same images Signed-off-by: Silvio Moioli --- multi-cluster/manifests/redis-master-deployment.yaml | 2 +- multi-cluster/manifests/redis-slave-deployment.yaml | 2 +- .../guestbook/templates/redis-master-deployment.yaml | 2 +- .../guestbook/templates/redis-slave-deployment.yaml | 2 +- .../helm/templates/redis-master-deployment.yaml | 2 +- single-cluster/helm/templates/redis-slave-deployment.yaml | 2 +- .../kustomize/base/redis-master-deployment.yaml | 2 +- single-cluster/kustomize/base/redis-slave-deployment.yaml | 2 +- .../manifests/deployments/redis-master-deployment.yaml | 2 +- .../manifests/deployments/redis-slave-deployment.yaml | 2 +- tests/expected/multi-cluster/helm/bundle.yaml | 4 ++-- tests/expected/multi-cluster/helm/dev-output.yaml | 2 +- tests/expected/multi-cluster/helm/prod-output.yaml | 4 ++-- tests/expected/multi-cluster/helm/test-output.yaml | 4 ++-- tests/expected/multi-cluster/kustomize/bundle.yaml | 4 ++-- tests/expected/multi-cluster/kustomize/dev-output.yaml | 4 ++-- tests/expected/multi-cluster/kustomize/prod-output.yaml | 4 ++-- tests/expected/multi-cluster/kustomize/test-output.yaml | 4 ++-- tests/expected/multi-cluster/manifests/bundle.yaml | 4 ++-- tests/expected/multi-cluster/manifests/dev-output.yaml | 2 +- tests/expected/multi-cluster/manifests/prod-output.yaml | 4 ++-- tests/expected/multi-cluster/manifests/test-output.yaml | 4 ++-- .../expected/single-cluster/helm-multi-chart/bundle.yaml | 8 ++++---- tests/expected/single-cluster/helm/bundle.yaml | 4 ++-- tests/expected/single-cluster/helm/dev-output.yaml | 4 ++-- tests/expected/single-cluster/helm/prod-output.yaml | 4 ++-- tests/expected/single-cluster/helm/test-output.yaml | 4 ++-- tests/expected/single-cluster/kustomize/bundle.yaml | 4 ++-- tests/expected/single-cluster/kustomize/dev-output.yaml | 4 ++-- tests/expected/single-cluster/kustomize/prod-output.yaml | 4 ++-- tests/expected/single-cluster/kustomize/test-output.yaml | 4 ++-- tests/expected/single-cluster/manifests/bundle.yaml | 4 ++-- tests/expected/single-cluster/manifests/dev-output.yaml | 4 ++-- tests/expected/single-cluster/manifests/prod-output.yaml | 4 ++-- tests/expected/single-cluster/manifests/test-output.yaml | 4 ++-- 35 files changed, 60 insertions(+), 60 deletions(-) diff --git a/multi-cluster/manifests/redis-master-deployment.yaml b/multi-cluster/manifests/redis-master-deployment.yaml index d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/redis-slave-deployment.yaml b/multi-cluster/manifests/redis-slave-deployment.yaml index dfdcd00..3005360 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 aed1759..0bb6020 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 aed1759..0bb6020 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 dfdcd00..3005360 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d675715..fd9b2f5 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: redis + image: k8s.gcr.io/redis:e2e 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 dfdcd00..3005360 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:v1 + image: gcr.io/google_samples/gb-redisslave:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index be839a5..01fdee9 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -147,7 +147,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -195,7 +195,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 d20c2ed..b446597 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: redis + - image: k8s.gcr.io/redis:e2e 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 c3ddc08..b13db55 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 ce25037..6c2bd08 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index 6f23d36..3ba1e0b 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -120,7 +120,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -167,7 +167,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 f1f0a0e..041130c 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 00898e5..193a7f8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 a4370c6..94f7db9 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index 4b1aedc..3b36bd8 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -156,7 +156,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -203,7 +203,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 1fd1558..0b06c59 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: redis + - image: k8s.gcr.io/redis:e2e 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 dc7ebe6..099f671 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 5f58ed8..72ac014 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 e72fed7..9e7846d 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -114,7 +114,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -162,7 +162,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 resources: requests: cpu: 100m @@ -372,7 +372,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -420,7 +420,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index c81fbcc..af40d33 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -136,7 +136,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -184,7 +184,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 38366ae..0365da8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 38366ae..0365da8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 38366ae..0365da8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index 3050f33..3f7cc4b 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -100,7 +100,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -147,7 +147,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 ab23513..c417fd8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 ab23513..c417fd8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 ab23513..c417fd8 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/manifests/bundle.yaml b/tests/expected/single-cluster/manifests/bundle.yaml index e88838c..b356066 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -74,7 +74,7 @@ spec: spec: containers: - name: master - image: redis + image: k8s.gcr.io/redis:e2e resources: requests: cpu: 100m @@ -103,7 +103,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: gcr.io/google_samples/gb-redisslave:v2 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 49b8d71..5570fdf 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 49b8d71..5570fdf 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 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 49b8d71..5570fdf 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: redis + - image: k8s.gcr.io/redis:e2e name: master ports: - containerPort: 6379 @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: gcr.io/google_samples/gb-redisslave:v2 name: slave ports: - containerPort: 6379