From 4bc4bb8ffefb5182a589bbc4edb7c19002949232 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20N=C3=A9au?= Date: Thu, 14 Mar 2024 11:53:48 +0100 Subject: [PATCH 1/3] Migrate tests to v4 frontend image from Artifact Registry The Container Registry is deprecated [1]. [1]: https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --- tests/expected/multi-cluster/helm-external/bundle.yaml | 2 +- tests/expected/multi-cluster/helm-external/dev-output.yaml | 2 +- tests/expected/multi-cluster/helm-external/prod-output.yaml | 2 +- tests/expected/multi-cluster/helm-external/test-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/bundle.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/dev-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/prod-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/test-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/bundle.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/dev-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/prod-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/test-output.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/expected/multi-cluster/helm-external/bundle.yaml b/tests/expected/multi-cluster/helm-external/bundle.yaml index bdb8b720..47f04507 100644 --- a/tests/expected/multi-cluster/helm-external/bundle.yaml +++ b/tests/expected/multi-cluster/helm-external/bundle.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v4 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm-external/dev-output.yaml b/tests/expected/multi-cluster/helm-external/dev-output.yaml index 2159838a..f492cecd 100644 --- a/tests/expected/multi-cluster/helm-external/dev-output.yaml +++ b/tests/expected/multi-cluster/helm-external/dev-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/multi-cluster/helm-external/prod-output.yaml b/tests/expected/multi-cluster/helm-external/prod-output.yaml index 8e3ebf0c..3b93ba64 100644 --- a/tests/expected/multi-cluster/helm-external/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-external/prod-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/multi-cluster/helm-external/test-output.yaml b/tests/expected/multi-cluster/helm-external/test-output.yaml index fbf2b799..3574f1ed 100644 --- a/tests/expected/multi-cluster/helm-external/test-output.yaml +++ b/tests/expected/multi-cluster/helm-external/test-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml index 016ee41f..6dde6771 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -38,7 +38,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v4 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml index 7d52f73f..6c9580b5 100644 --- a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml index 5ddc1558..181bbdda 100644 --- a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml index a8da5efc..0c98c59b 100644 --- a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/single-cluster/helm-kustomize/bundle.yaml b/tests/expected/single-cluster/helm-kustomize/bundle.yaml index f6f8a1a1..e8168c93 100644 --- a/tests/expected/single-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/single-cluster/helm-kustomize/bundle.yaml @@ -40,7 +40,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v4 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml index 034c3406..a463901b 100644 --- a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml index 034c3406..a463901b 100644 --- a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 diff --git a/tests/expected/single-cluster/helm-kustomize/test-output.yaml b/tests/expected/single-cluster/helm-kustomize/test-output.yaml index 034c3406..a463901b 100644 --- a/tests/expected/single-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/test-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v4 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80 From ac0b6a567c3ea611cf93eb27131868f76174796d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20N=C3=A9au?= Date: Thu, 14 Mar 2024 11:58:41 +0100 Subject: [PATCH 2/3] Migrate examples and tests to v2 Redis follower image from Artifact Registry The Container Registry is deprecated [1]. [1]: https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --- multi-cluster/helm/templates/redis-slave-deployment.yaml | 2 +- multi-cluster/kustomize/base/redis-slave-deployment.yaml | 2 +- multi-cluster/manifests/redis-slave-deployment.yaml | 2 +- simple/redis-slave-deployment.yaml | 2 +- .../guestbook/templates/redis-slave-deployment.yaml | 2 +- single-cluster/helm/templates/redis-slave-deployment.yaml | 2 +- single-cluster/kustomize/base/redis-slave-deployment.yaml | 2 +- .../manifests/deployments/redis-slave-deployment.yaml | 2 +- tests/expected/multi-cluster/helm-external/bundle.yaml | 2 +- tests/expected/multi-cluster/helm-external/prod-output.yaml | 2 +- tests/expected/multi-cluster/helm-external/test-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/bundle.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/dev-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/prod-output.yaml | 2 +- tests/expected/multi-cluster/helm-kustomize/test-output.yaml | 2 +- tests/expected/multi-cluster/helm/bundle.yaml | 2 +- tests/expected/multi-cluster/helm/prod-output.yaml | 2 +- tests/expected/multi-cluster/helm/test-output.yaml | 2 +- tests/expected/multi-cluster/kustomize/bundle.yaml | 2 +- tests/expected/multi-cluster/kustomize/dev-output.yaml | 2 +- tests/expected/multi-cluster/kustomize/prod-output.yaml | 2 +- tests/expected/multi-cluster/kustomize/test-output.yaml | 2 +- tests/expected/multi-cluster/manifests/bundle.yaml | 2 +- tests/expected/multi-cluster/manifests/prod-output.yaml | 2 +- tests/expected/multi-cluster/manifests/test-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/bundle.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/dev-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/prod-output.yaml | 2 +- tests/expected/single-cluster/helm-kustomize/test-output.yaml | 2 +- tests/expected/single-cluster/helm-multi-chart/bundle.yaml | 2 +- tests/expected/single-cluster/helm/bundle.yaml | 2 +- tests/expected/single-cluster/helm/dev-output.yaml | 2 +- tests/expected/single-cluster/helm/prod-output.yaml | 2 +- tests/expected/single-cluster/helm/test-output.yaml | 2 +- tests/expected/single-cluster/kustomize/bundle.yaml | 2 +- tests/expected/single-cluster/kustomize/dev-output.yaml | 2 +- tests/expected/single-cluster/kustomize/prod-output.yaml | 2 +- tests/expected/single-cluster/kustomize/test-output.yaml | 2 +- tests/expected/single-cluster/manifests/bundle.yaml | 2 +- tests/expected/single-cluster/manifests/dev-output.yaml | 2 +- tests/expected/single-cluster/manifests/prod-output.yaml | 2 +- tests/expected/single-cluster/manifests/test-output.yaml | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/multi-cluster/helm/templates/redis-slave-deployment.yaml b/multi-cluster/helm/templates/redis-slave-deployment.yaml index 0bb6020f..194c81e1 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 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..7b75d355 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/redis-slave-deployment.yaml b/multi-cluster/manifests/redis-slave-deployment.yaml index 30053601..7b75d355 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/simple/redis-slave-deployment.yaml b/simple/redis-slave-deployment.yaml index 30053601..7b75d355 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 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..194c81e1 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 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..194c81e1 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 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..7b75d355 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 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..7b75d355 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: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm-external/bundle.yaml b/tests/expected/multi-cluster/helm-external/bundle.yaml index 47f04507..7ad88c4f 100644 --- a/tests/expected/multi-cluster/helm-external/bundle.yaml +++ b/tests/expected/multi-cluster/helm-external/bundle.yaml @@ -131,7 +131,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm-external/prod-output.yaml b/tests/expected/multi-cluster/helm-external/prod-output.yaml index 3b93ba64..d3b2dc2b 100644 --- a/tests/expected/multi-cluster/helm-external/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-external/prod-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm-external/test-output.yaml b/tests/expected/multi-cluster/helm-external/test-output.yaml index 3574f1ed..30a1516f 100644 --- a/tests/expected/multi-cluster/helm-external/test-output.yaml +++ b/tests/expected/multi-cluster/helm-external/test-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml index 6dde6771..87bbbdee 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -131,7 +131,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml index 6c9580b5..6ef10944 100644 --- a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml index 181bbdda..1c139f79 100644 --- a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml index 0c98c59b..214b91e5 100644 --- a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index e3d49142..6bb5e6cc 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -197,7 +197,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml index b36f6f37..768d1234 100644 --- a/tests/expected/multi-cluster/helm/prod-output.yaml +++ b/tests/expected/multi-cluster/helm/prod-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 6b970deb..ff81659f 100644 --- a/tests/expected/multi-cluster/helm/test-output.yaml +++ b/tests/expected/multi-cluster/helm/test-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 df9006de..3a8520a3 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -169,7 +169,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 15e3d749..02b6a28c 100644 --- a/tests/expected/multi-cluster/kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 15660f35..88854073 100644 --- a/tests/expected/multi-cluster/kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 afcb5422..f6d8cb21 100644 --- a/tests/expected/multi-cluster/kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/kustomize/test-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 cbadaf32..c05e141d 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -205,7 +205,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml index 3d082031..766d9b95 100644 --- a/tests/expected/multi-cluster/manifests/prod-output.yaml +++ b/tests/expected/multi-cluster/manifests/prod-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 6807705d..05e63a35 100644 --- a/tests/expected/multi-cluster/manifests/test-output.yaml +++ b/tests/expected/multi-cluster/manifests/test-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm-kustomize/bundle.yaml b/tests/expected/single-cluster/helm-kustomize/bundle.yaml index e8168c93..e3ba5b1c 100644 --- a/tests/expected/single-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/single-cluster/helm-kustomize/bundle.yaml @@ -133,7 +133,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml index a463901b..9203c78e 100644 --- a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml index a463901b..9203c78e 100644 --- a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 diff --git a/tests/expected/single-cluster/helm-kustomize/test-output.yaml b/tests/expected/single-cluster/helm-kustomize/test-output.yaml index a463901b..9203c78e 100644 --- a/tests/expected/single-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/test-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 18d9dfed..5d271de6 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -167,7 +167,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index 302272ec..625df1b6 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -186,7 +186,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 560d92d1..cfef9c3e 100644 --- a/tests/expected/single-cluster/helm/dev-output.yaml +++ b/tests/expected/single-cluster/helm/dev-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 560d92d1..cfef9c3e 100644 --- a/tests/expected/single-cluster/helm/prod-output.yaml +++ b/tests/expected/single-cluster/helm/prod-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 560d92d1..cfef9c3e 100644 --- a/tests/expected/single-cluster/helm/test-output.yaml +++ b/tests/expected/single-cluster/helm/test-output.yaml @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 8f4f4e9a..16684840 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -149,7 +149,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 dd9138c7..eb6c3fe9 100644 --- a/tests/expected/single-cluster/kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/kustomize/dev-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 dd9138c7..eb6c3fe9 100644 --- a/tests/expected/single-cluster/kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/kustomize/prod-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 dd9138c7..eb6c3fe9 100644 --- a/tests/expected/single-cluster/kustomize/test-output.yaml +++ b/tests/expected/single-cluster/kustomize/test-output.yaml @@ -130,7 +130,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 d5cc23cd..dfa165e0 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -105,7 +105,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v2 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 92420d30..6cd94c8b 100644 --- a/tests/expected/single-cluster/manifests/dev-output.yaml +++ b/tests/expected/single-cluster/manifests/dev-output.yaml @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 92420d30..6cd94c8b 100644 --- a/tests/expected/single-cluster/manifests/prod-output.yaml +++ b/tests/expected/single-cluster/manifests/prod-output.yaml @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower: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 92420d30..6cd94c8b 100644 --- a/tests/expected/single-cluster/manifests/test-output.yaml +++ b/tests/expected/single-cluster/manifests/test-output.yaml @@ -88,7 +88,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v2 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 name: slave ports: - containerPort: 6379 From fb2d840ef73aabb798904554b00700480ea2a8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20N=C3=A9au?= Date: Thu, 14 Mar 2024 12:23:32 +0100 Subject: [PATCH 3/3] Replace slave/master terminology with follower/leader This brings consistency with image names from Google's Artifact Registry, and is an opportunity to use more inclusive language. --- .../overlays/dev/kustomization.yaml | 4 +- ...nt.yaml => redis-follower-deployment.yaml} | 2 +- .../overlays/dev/redis-follower-service.yaml | 4 +- ...nt.yaml => redis-follower-deployment.yaml} | 8 +-- .../templates/redis-follower-service.yaml | 8 +-- .../templates/redis-leader-deployment.yaml} | 8 +-- .../templates/redis-leader-service.yaml} | 6 +- .../kustomize/base/kustomization.yaml | 8 +-- .../base/redis-follower-deployment.yaml | 8 +-- .../base/redis-follower-service.yaml} | 6 +- .../base/redis-leader-deployment.yaml | 8 +-- ...service.yaml => redis-leader-service.yaml} | 6 +- .../kustomize/overlays/dev/kustomization.yaml | 4 +- .../dev/redis-follower-deployment.yaml | 2 +- .../overlays/dev/redis-follower-service.yaml} | 4 +- ...nt.yaml => redis-follower-deployment.yaml} | 0 ...yaml => redis-follower-service_patch.yaml} | 2 +- .../redis-follower-deployment.yaml} | 8 +-- .../manifests/redis-follower-service.yaml | 6 +- .../redis-leader-deployment.yaml} | 8 +-- .../manifests/redis-leader-service.yaml | 6 +- .../redis-follower-deployment.yaml | 8 +-- .../redis-follower-service.yaml | 6 +- .../redis-leader-deployment.yaml | 8 +-- .../redis-leader-service.yaml | 6 +- .../overlays/dev/kustomization.yaml | 4 +- .../dev/redis-follower-deployment.yaml | 2 +- .../overlays/dev/redis-follower-service.yaml} | 4 +- ...nt.yaml => redis-follower-deployment.yaml} | 8 +-- .../templates/redis-follower-service.yaml | 8 +-- .../templates/redis-leader-deployment.yaml | 27 +++++++++ .../templates/redis-leader-service.yaml | 16 +++++ .../templates/redis-master-deployment.yaml | 27 --------- .../templates/redis-master-service.yaml | 16 ----- ...nt.yaml => redis-follower-deployment.yaml} | 8 +-- ...rvice.yaml => redis-follower-service.yaml} | 8 +-- .../templates/redis-leader-deployment.yaml | 27 +++++++++ .../helm/templates/redis-leader-service.yaml | 16 +++++ .../templates/redis-master-deployment.yaml | 27 --------- .../helm/templates/redis-master-service.yaml | 16 ----- .../kustomize/base/kustomization.yaml | 8 +-- .../base/redis-follower-deployment.yaml | 8 +-- ...rvice.yaml => redis-follower-service.yaml} | 6 +- .../base/redis-leader-deployment.yaml | 27 +++++++++ .../kustomize/base/redis-leader-service.yaml | 16 +++++ .../base/redis-master-deployment.yaml | 27 --------- .../kustomize/base/redis-master-service.yaml | 16 ----- .../kustomize/overlays/dev/kustomization.yaml | 4 +- ...nt.yaml => redis-follower-deployment.yaml} | 2 +- .../overlays/dev/redis-follower-service.yaml | 4 +- .../redis-follower-deployment.yaml | 27 +++++++++ .../deployments/redis-leader-deployment.yaml | 27 +++++++++ .../deployments/redis-master-deployment.yaml | 27 --------- .../deployments/redis-slave-deployment.yaml | 27 --------- .../services/redis-follower-service.yaml | 15 +++++ .../services/redis-leader-service.yaml | 16 +++++ .../services/redis-master-service.yaml | 16 ----- .../services/redis-slave-service.yaml | 15 ----- .../multi-cluster/helm-external/bundle.yaml | 38 ++++++------ .../helm-external/dev-output.yaml | 20 +++---- .../helm-external/prod-output.yaml | 28 ++++----- .../helm-external/test-output.yaml | 28 ++++----- .../multi-cluster/helm-kustomize/bundle.yaml | 52 ++++++++--------- .../helm-kustomize/dev-output.yaml | 28 ++++----- .../helm-kustomize/prod-output.yaml | 28 ++++----- .../helm-kustomize/test-output.yaml | 28 ++++----- tests/expected/multi-cluster/helm/bundle.yaml | 38 ++++++------ .../multi-cluster/helm/dev-output.yaml | 20 +++---- .../multi-cluster/helm/prod-output.yaml | 28 ++++----- .../multi-cluster/helm/test-output.yaml | 28 ++++----- .../multi-cluster/kustomize/bundle.yaml | 58 +++++++++---------- .../multi-cluster/kustomize/dev-output.yaml | 28 ++++----- .../multi-cluster/kustomize/prod-output.yaml | 28 ++++----- .../multi-cluster/kustomize/test-output.yaml | 28 ++++----- .../multi-cluster/manifests/bundle.yaml | 42 +++++++------- .../multi-cluster/manifests/dev-output.yaml | 20 +++---- .../multi-cluster/manifests/prod-output.yaml | 28 ++++----- .../multi-cluster/manifests/test-output.yaml | 28 ++++----- .../single-cluster/helm-kustomize/bundle.yaml | 52 ++++++++--------- .../helm-kustomize/dev-output.yaml | 28 ++++----- .../helm-kustomize/prod-output.yaml | 28 ++++----- .../helm-kustomize/test-output.yaml | 28 ++++----- .../helm-multi-chart/bundle.yaml | 38 ++++++------ .../expected/single-cluster/helm/bundle.yaml | 38 ++++++------ .../single-cluster/helm/dev-output.yaml | 28 ++++----- .../single-cluster/helm/prod-output.yaml | 28 ++++----- .../single-cluster/helm/test-output.yaml | 28 ++++----- .../single-cluster/kustomize/bundle.yaml | 58 +++++++++---------- .../single-cluster/kustomize/dev-output.yaml | 28 ++++----- .../single-cluster/kustomize/prod-output.yaml | 28 ++++----- .../single-cluster/kustomize/test-output.yaml | 28 ++++----- .../single-cluster/manifests/bundle.yaml | 36 ++++++------ .../single-cluster/manifests/dev-output.yaml | 28 ++++----- .../single-cluster/manifests/prod-output.yaml | 28 ++++----- .../single-cluster/manifests/test-output.yaml | 28 ++++----- 95 files changed, 914 insertions(+), 914 deletions(-) rename multi-cluster/helm-kustomize/overlays/dev/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (74%) rename single-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml => multi-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml (58%) rename multi-cluster/helm/templates/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (84%) rename single-cluster/helm-multi-chart/guestbook/templates/redis-slave-service.yaml => multi-cluster/helm/templates/redis-follower-service.yaml (73%) rename multi-cluster/{manifests/redis-master-deployment.yaml => helm/templates/redis-leader-deployment.yaml} (83%) rename multi-cluster/{manifests/redis-master-service.yaml => helm/templates/redis-leader-service.yaml} (76%) rename single-cluster/kustomize/base/redis-slave-deployment.yaml => multi-cluster/kustomize/base/redis-follower-deployment.yaml (83%) rename multi-cluster/{manifests/redis-slave-service.yaml => kustomize/base/redis-follower-service.yaml} (72%) rename simple/redis-master-deployment.yaml => multi-cluster/kustomize/base/redis-leader-deployment.yaml (83%) rename multi-cluster/kustomize/base/{redis-master-service.yaml => redis-leader-service.yaml} (76%) rename single-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml => multi-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml (74%) rename multi-cluster/{helm-kustomize/overlays/dev/redis-slave-service.yaml => kustomize/overlays/dev/redis-follower-service.yaml} (58%) rename multi-cluster/manifests/overlays/noreplication/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (100%) rename multi-cluster/manifests/overlays/noreplication/{redis-slave-service_patch.yaml => redis-follower-service_patch.yaml} (51%) rename multi-cluster/{kustomize/base/redis-slave-deployment.yaml => manifests/redis-follower-deployment.yaml} (83%) rename simple/redis-slave-service.yaml => multi-cluster/manifests/redis-follower-service.yaml (72%) rename multi-cluster/{helm/templates/redis-master-deployment.yaml => manifests/redis-leader-deployment.yaml} (83%) rename simple/redis-master-service.yaml => multi-cluster/manifests/redis-leader-service.yaml (76%) rename multi-cluster/manifests/redis-slave-deployment.yaml => simple/redis-follower-deployment.yaml (83%) rename multi-cluster/kustomize/base/redis-slave-service.yaml => simple/redis-follower-service.yaml (72%) rename multi-cluster/kustomize/base/redis-master-deployment.yaml => simple/redis-leader-deployment.yaml (83%) rename multi-cluster/helm/templates/redis-master-service.yaml => simple/redis-leader-service.yaml (76%) rename multi-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml => single-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml (74%) rename single-cluster/{kustomize/overlays/dev/redis-slave-service.yaml => helm-kustomize/overlays/dev/redis-follower-service.yaml} (58%) rename single-cluster/helm-multi-chart/guestbook/templates/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (84%) rename multi-cluster/helm/templates/redis-slave-service.yaml => single-cluster/helm-multi-chart/guestbook/templates/redis-follower-service.yaml (73%) create mode 100644 single-cluster/helm-multi-chart/guestbook/templates/redis-leader-deployment.yaml create mode 100644 single-cluster/helm-multi-chart/guestbook/templates/redis-leader-service.yaml delete mode 100644 single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml delete mode 100644 single-cluster/helm-multi-chart/guestbook/templates/redis-master-service.yaml rename single-cluster/helm/templates/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (84%) rename single-cluster/helm/templates/{redis-slave-service.yaml => redis-follower-service.yaml} (73%) create mode 100644 single-cluster/helm/templates/redis-leader-deployment.yaml create mode 100644 single-cluster/helm/templates/redis-leader-service.yaml delete mode 100644 single-cluster/helm/templates/redis-master-deployment.yaml delete mode 100644 single-cluster/helm/templates/redis-master-service.yaml rename simple/redis-slave-deployment.yaml => single-cluster/kustomize/base/redis-follower-deployment.yaml (83%) rename single-cluster/kustomize/base/{redis-slave-service.yaml => redis-follower-service.yaml} (72%) create mode 100644 single-cluster/kustomize/base/redis-leader-deployment.yaml create mode 100644 single-cluster/kustomize/base/redis-leader-service.yaml delete mode 100644 single-cluster/kustomize/base/redis-master-deployment.yaml delete mode 100644 single-cluster/kustomize/base/redis-master-service.yaml rename single-cluster/kustomize/overlays/dev/{redis-slave-deployment.yaml => redis-follower-deployment.yaml} (74%) rename multi-cluster/kustomize/overlays/dev/redis-slave-service.yaml => single-cluster/kustomize/overlays/dev/redis-follower-service.yaml (58%) create mode 100644 single-cluster/manifests/deployments/redis-follower-deployment.yaml create mode 100644 single-cluster/manifests/deployments/redis-leader-deployment.yaml delete mode 100644 single-cluster/manifests/deployments/redis-master-deployment.yaml delete mode 100644 single-cluster/manifests/deployments/redis-slave-deployment.yaml create mode 100644 single-cluster/manifests/services/redis-follower-service.yaml create mode 100644 single-cluster/manifests/services/redis-leader-service.yaml delete mode 100644 single-cluster/manifests/services/redis-master-service.yaml delete mode 100644 single-cluster/manifests/services/redis-slave-service.yaml diff --git a/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml b/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml index 14211d6a..65eaf146 100644 --- a/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml +++ b/multi-cluster/helm-kustomize/overlays/dev/kustomization.yaml @@ -1,3 +1,3 @@ patchesStrategicMerge: -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/multi-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml b/multi-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml similarity index 74% rename from multi-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml rename to multi-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml index 238ee8c0..ea7fcaf0 100644 --- a/multi-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml +++ b/multi-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml @@ -1,6 +1,6 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 diff --git a/single-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml b/multi-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml similarity index 58% rename from single-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml rename to multi-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml index d2a93da3..9a1dc21b 100644 --- a/single-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml +++ b/multi-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master + role: leader diff --git a/multi-cluster/helm/templates/redis-slave-deployment.yaml b/multi-cluster/helm/templates/redis-follower-deployment.yaml similarity index 84% rename from multi-cluster/helm/templates/redis-slave-deployment.yaml rename to multi-cluster/helm/templates/redis-follower-deployment.yaml index 194c81e1..db80e9fe 100644 --- a/multi-cluster/helm/templates/redis-slave-deployment.yaml +++ b/multi-cluster/helm/templates/redis-follower-deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-service.yaml b/multi-cluster/helm/templates/redis-follower-service.yaml similarity index 73% rename from single-cluster/helm-multi-chart/guestbook/templates/redis-slave-service.yaml rename to multi-cluster/helm/templates/redis-follower-service.yaml index f8260557..7241fca5 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-service.yaml +++ b/multi-cluster/helm/templates/redis-follower-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -12,8 +12,8 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend diff --git a/multi-cluster/manifests/redis-master-deployment.yaml b/multi-cluster/helm/templates/redis-leader-deployment.yaml similarity index 83% rename from multi-cluster/manifests/redis-master-deployment.yaml rename to multi-cluster/helm/templates/redis-leader-deployment.yaml index d815405b..85cdbd27 100644 --- a/multi-cluster/manifests/redis-master-deployment.yaml +++ b/multi-cluster/helm/templates/redis-leader-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: diff --git a/multi-cluster/manifests/redis-master-service.yaml b/multi-cluster/helm/templates/redis-leader-service.yaml similarity index 76% rename from multi-cluster/manifests/redis-master-service.yaml rename to multi-cluster/helm/templates/redis-leader-service.yaml index a484014f..4c124f04 100644 --- a/multi-cluster/manifests/redis-master-service.yaml +++ b/multi-cluster/helm/templates/redis-leader-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -12,5 +12,5 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/multi-cluster/kustomize/base/kustomization.yaml b/multi-cluster/kustomize/base/kustomization.yaml index 491cedc8..b81d5f80 100644 --- a/multi-cluster/kustomize/base/kustomization.yaml +++ b/multi-cluster/kustomize/base/kustomization.yaml @@ -1,7 +1,7 @@ resources: - frontend-deployment.yaml - frontend-service.yaml -- redis-master-deployment.yaml -- redis-master-service.yaml -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-leader-deployment.yaml +- redis-leader-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/single-cluster/kustomize/base/redis-slave-deployment.yaml b/multi-cluster/kustomize/base/redis-follower-deployment.yaml similarity index 83% rename from single-cluster/kustomize/base/redis-slave-deployment.yaml rename to multi-cluster/kustomize/base/redis-follower-deployment.yaml index 7b75d355..96b47bf5 100644 --- a/single-cluster/kustomize/base/redis-slave-deployment.yaml +++ b/multi-cluster/kustomize/base/redis-follower-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/multi-cluster/manifests/redis-slave-service.yaml b/multi-cluster/kustomize/base/redis-follower-service.yaml similarity index 72% rename from multi-cluster/manifests/redis-slave-service.yaml rename to multi-cluster/kustomize/base/redis-follower-service.yaml index 238fd63f..b19fd8ce 100644 --- a/multi-cluster/manifests/redis-slave-service.yaml +++ b/multi-cluster/kustomize/base/redis-follower-service.yaml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/simple/redis-master-deployment.yaml b/multi-cluster/kustomize/base/redis-leader-deployment.yaml similarity index 83% rename from simple/redis-master-deployment.yaml rename to multi-cluster/kustomize/base/redis-leader-deployment.yaml index d815405b..85cdbd27 100644 --- a/simple/redis-master-deployment.yaml +++ b/multi-cluster/kustomize/base/redis-leader-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: diff --git a/multi-cluster/kustomize/base/redis-master-service.yaml b/multi-cluster/kustomize/base/redis-leader-service.yaml similarity index 76% rename from multi-cluster/kustomize/base/redis-master-service.yaml rename to multi-cluster/kustomize/base/redis-leader-service.yaml index a484014f..4c124f04 100644 --- a/multi-cluster/kustomize/base/redis-master-service.yaml +++ b/multi-cluster/kustomize/base/redis-leader-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -12,5 +12,5 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/multi-cluster/kustomize/overlays/dev/kustomization.yaml b/multi-cluster/kustomize/overlays/dev/kustomization.yaml index a9f9b3d8..4c7f1cc7 100644 --- a/multi-cluster/kustomize/overlays/dev/kustomization.yaml +++ b/multi-cluster/kustomize/overlays/dev/kustomization.yaml @@ -1,5 +1,5 @@ resources: - ../../base patchesStrategicMerge: -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/single-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml b/multi-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml similarity index 74% rename from single-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml rename to multi-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml index 238ee8c0..ea7fcaf0 100644 --- a/single-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml +++ b/multi-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml @@ -1,6 +1,6 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 diff --git a/multi-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml b/multi-cluster/kustomize/overlays/dev/redis-follower-service.yaml similarity index 58% rename from multi-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml rename to multi-cluster/kustomize/overlays/dev/redis-follower-service.yaml index d2a93da3..9a1dc21b 100644 --- a/multi-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml +++ b/multi-cluster/kustomize/overlays/dev/redis-follower-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master + role: leader diff --git a/multi-cluster/manifests/overlays/noreplication/redis-slave-deployment.yaml b/multi-cluster/manifests/overlays/noreplication/redis-follower-deployment.yaml similarity index 100% rename from multi-cluster/manifests/overlays/noreplication/redis-slave-deployment.yaml rename to multi-cluster/manifests/overlays/noreplication/redis-follower-deployment.yaml diff --git a/multi-cluster/manifests/overlays/noreplication/redis-slave-service_patch.yaml b/multi-cluster/manifests/overlays/noreplication/redis-follower-service_patch.yaml similarity index 51% rename from multi-cluster/manifests/overlays/noreplication/redis-slave-service_patch.yaml rename to multi-cluster/manifests/overlays/noreplication/redis-follower-service_patch.yaml index 855b279f..c50fcbe9 100644 --- a/multi-cluster/manifests/overlays/noreplication/redis-slave-service_patch.yaml +++ b/multi-cluster/manifests/overlays/noreplication/redis-follower-service_patch.yaml @@ -1,3 +1,3 @@ spec: selector: - role: master + role: leader diff --git a/multi-cluster/kustomize/base/redis-slave-deployment.yaml b/multi-cluster/manifests/redis-follower-deployment.yaml similarity index 83% rename from multi-cluster/kustomize/base/redis-slave-deployment.yaml rename to multi-cluster/manifests/redis-follower-deployment.yaml index 7b75d355..96b47bf5 100644 --- a/multi-cluster/kustomize/base/redis-slave-deployment.yaml +++ b/multi-cluster/manifests/redis-follower-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/simple/redis-slave-service.yaml b/multi-cluster/manifests/redis-follower-service.yaml similarity index 72% rename from simple/redis-slave-service.yaml rename to multi-cluster/manifests/redis-follower-service.yaml index 238fd63f..b19fd8ce 100644 --- a/simple/redis-slave-service.yaml +++ b/multi-cluster/manifests/redis-follower-service.yaml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/multi-cluster/helm/templates/redis-master-deployment.yaml b/multi-cluster/manifests/redis-leader-deployment.yaml similarity index 83% rename from multi-cluster/helm/templates/redis-master-deployment.yaml rename to multi-cluster/manifests/redis-leader-deployment.yaml index d815405b..85cdbd27 100644 --- a/multi-cluster/helm/templates/redis-master-deployment.yaml +++ b/multi-cluster/manifests/redis-leader-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: diff --git a/simple/redis-master-service.yaml b/multi-cluster/manifests/redis-leader-service.yaml similarity index 76% rename from simple/redis-master-service.yaml rename to multi-cluster/manifests/redis-leader-service.yaml index a484014f..4c124f04 100644 --- a/simple/redis-master-service.yaml +++ b/multi-cluster/manifests/redis-leader-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -12,5 +12,5 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/multi-cluster/manifests/redis-slave-deployment.yaml b/simple/redis-follower-deployment.yaml similarity index 83% rename from multi-cluster/manifests/redis-slave-deployment.yaml rename to simple/redis-follower-deployment.yaml index 7b75d355..96b47bf5 100644 --- a/multi-cluster/manifests/redis-slave-deployment.yaml +++ b/simple/redis-follower-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/multi-cluster/kustomize/base/redis-slave-service.yaml b/simple/redis-follower-service.yaml similarity index 72% rename from multi-cluster/kustomize/base/redis-slave-service.yaml rename to simple/redis-follower-service.yaml index 238fd63f..b19fd8ce 100644 --- a/multi-cluster/kustomize/base/redis-slave-service.yaml +++ b/simple/redis-follower-service.yaml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/multi-cluster/kustomize/base/redis-master-deployment.yaml b/simple/redis-leader-deployment.yaml similarity index 83% rename from multi-cluster/kustomize/base/redis-master-deployment.yaml rename to simple/redis-leader-deployment.yaml index d815405b..85cdbd27 100644 --- a/multi-cluster/kustomize/base/redis-master-deployment.yaml +++ b/simple/redis-leader-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: diff --git a/multi-cluster/helm/templates/redis-master-service.yaml b/simple/redis-leader-service.yaml similarity index 76% rename from multi-cluster/helm/templates/redis-master-service.yaml rename to simple/redis-leader-service.yaml index a484014f..4c124f04 100644 --- a/multi-cluster/helm/templates/redis-master-service.yaml +++ b/simple/redis-leader-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -12,5 +12,5 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml b/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml index 14211d6a..65eaf146 100644 --- a/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml +++ b/single-cluster/helm-kustomize/overlays/dev/kustomization.yaml @@ -1,3 +1,3 @@ patchesStrategicMerge: -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/multi-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml b/single-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml similarity index 74% rename from multi-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml rename to single-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml index 238ee8c0..ea7fcaf0 100644 --- a/multi-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml +++ b/single-cluster/helm-kustomize/overlays/dev/redis-follower-deployment.yaml @@ -1,6 +1,6 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 diff --git a/single-cluster/kustomize/overlays/dev/redis-slave-service.yaml b/single-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml similarity index 58% rename from single-cluster/kustomize/overlays/dev/redis-slave-service.yaml rename to single-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml index d2a93da3..9a1dc21b 100644 --- a/single-cluster/kustomize/overlays/dev/redis-slave-service.yaml +++ b/single-cluster/helm-kustomize/overlays/dev/redis-follower-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master + role: leader diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-follower-deployment.yaml similarity index 84% rename from single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml rename to single-cluster/helm-multi-chart/guestbook/templates/redis-follower-deployment.yaml index 194c81e1..db80e9fe 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-follower-deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/multi-cluster/helm/templates/redis-slave-service.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-follower-service.yaml similarity index 73% rename from multi-cluster/helm/templates/redis-slave-service.yaml rename to single-cluster/helm-multi-chart/guestbook/templates/redis-follower-service.yaml index f8260557..7241fca5 100644 --- a/multi-cluster/helm/templates/redis-slave-service.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-follower-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -12,8 +12,8 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-deployment.yaml new file mode 100644 index 00000000..85cdbd27 --- /dev/null +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis-leader +spec: + selector: + matchLabels: + app: redis + role: leader + tier: backend + replicas: 1 + template: + metadata: + labels: + app: redis + role: leader + tier: backend + spec: + containers: + - name: leader + image: registry.k8s.io/redis:e2e + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-service.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-service.yaml new file mode 100644 index 00000000..4c124f04 --- /dev/null +++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-leader-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-leader + labels: + app: redis + role: leader + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: leader + tier: backend 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 deleted file mode 100644 index d815405b..00000000 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis-master -spec: - selector: - matchLabels: - app: redis - role: master - tier: backend - replicas: 1 - template: - metadata: - labels: - app: redis - role: master - tier: backend - spec: - containers: - - name: master - image: registry.k8s.io/redis:e2e - resources: - requests: - cpu: 100m - memory: 100Mi - ports: - - containerPort: 6379 diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-service.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-service.yaml deleted file mode 100644 index a484014f..00000000 --- a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - app: redis - role: master - tier: backend -spec: - ports: - - port: 6379 - targetPort: 6379 - selector: - app: redis - role: master - tier: backend diff --git a/single-cluster/helm/templates/redis-slave-deployment.yaml b/single-cluster/helm/templates/redis-follower-deployment.yaml similarity index 84% rename from single-cluster/helm/templates/redis-slave-deployment.yaml rename to single-cluster/helm/templates/redis-follower-deployment.yaml index 194c81e1..db80e9fe 100644 --- a/single-cluster/helm/templates/redis-slave-deployment.yaml +++ b/single-cluster/helm/templates/redis-follower-deployment.yaml @@ -2,23 +2,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/single-cluster/helm/templates/redis-slave-service.yaml b/single-cluster/helm/templates/redis-follower-service.yaml similarity index 73% rename from single-cluster/helm/templates/redis-slave-service.yaml rename to single-cluster/helm/templates/redis-follower-service.yaml index f8260557..7241fca5 100644 --- a/single-cluster/helm/templates/redis-slave-service.yaml +++ b/single-cluster/helm/templates/redis-follower-service.yaml @@ -1,10 +1,10 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -12,8 +12,8 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend diff --git a/single-cluster/helm/templates/redis-leader-deployment.yaml b/single-cluster/helm/templates/redis-leader-deployment.yaml new file mode 100644 index 00000000..85cdbd27 --- /dev/null +++ b/single-cluster/helm/templates/redis-leader-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis-leader +spec: + selector: + matchLabels: + app: redis + role: leader + tier: backend + replicas: 1 + template: + metadata: + labels: + app: redis + role: leader + tier: backend + spec: + containers: + - name: leader + image: registry.k8s.io/redis:e2e + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/single-cluster/helm/templates/redis-leader-service.yaml b/single-cluster/helm/templates/redis-leader-service.yaml new file mode 100644 index 00000000..4c124f04 --- /dev/null +++ b/single-cluster/helm/templates/redis-leader-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-leader + labels: + app: redis + role: leader + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: leader + tier: backend diff --git a/single-cluster/helm/templates/redis-master-deployment.yaml b/single-cluster/helm/templates/redis-master-deployment.yaml deleted file mode 100644 index d815405b..00000000 --- a/single-cluster/helm/templates/redis-master-deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis-master -spec: - selector: - matchLabels: - app: redis - role: master - tier: backend - replicas: 1 - template: - metadata: - labels: - app: redis - role: master - tier: backend - spec: - containers: - - name: master - image: registry.k8s.io/redis:e2e - resources: - requests: - cpu: 100m - memory: 100Mi - ports: - - containerPort: 6379 diff --git a/single-cluster/helm/templates/redis-master-service.yaml b/single-cluster/helm/templates/redis-master-service.yaml deleted file mode 100644 index a484014f..00000000 --- a/single-cluster/helm/templates/redis-master-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - app: redis - role: master - tier: backend -spec: - ports: - - port: 6379 - targetPort: 6379 - selector: - app: redis - role: master - tier: backend diff --git a/single-cluster/kustomize/base/kustomization.yaml b/single-cluster/kustomize/base/kustomization.yaml index 491cedc8..b81d5f80 100644 --- a/single-cluster/kustomize/base/kustomization.yaml +++ b/single-cluster/kustomize/base/kustomization.yaml @@ -1,7 +1,7 @@ resources: - frontend-deployment.yaml - frontend-service.yaml -- redis-master-deployment.yaml -- redis-master-service.yaml -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-leader-deployment.yaml +- redis-leader-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/simple/redis-slave-deployment.yaml b/single-cluster/kustomize/base/redis-follower-deployment.yaml similarity index 83% rename from simple/redis-slave-deployment.yaml rename to single-cluster/kustomize/base/redis-follower-deployment.yaml index 7b75d355..96b47bf5 100644 --- a/simple/redis-slave-deployment.yaml +++ b/single-cluster/kustomize/base/redis-follower-deployment.yaml @@ -1,23 +1,23 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: diff --git a/single-cluster/kustomize/base/redis-slave-service.yaml b/single-cluster/kustomize/base/redis-follower-service.yaml similarity index 72% rename from single-cluster/kustomize/base/redis-slave-service.yaml rename to single-cluster/kustomize/base/redis-follower-service.yaml index 238fd63f..b19fd8ce 100644 --- a/single-cluster/kustomize/base/redis-slave-service.yaml +++ b/single-cluster/kustomize/base/redis-follower-service.yaml @@ -1,15 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/single-cluster/kustomize/base/redis-leader-deployment.yaml b/single-cluster/kustomize/base/redis-leader-deployment.yaml new file mode 100644 index 00000000..85cdbd27 --- /dev/null +++ b/single-cluster/kustomize/base/redis-leader-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis-leader +spec: + selector: + matchLabels: + app: redis + role: leader + tier: backend + replicas: 1 + template: + metadata: + labels: + app: redis + role: leader + tier: backend + spec: + containers: + - name: leader + image: registry.k8s.io/redis:e2e + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/single-cluster/kustomize/base/redis-leader-service.yaml b/single-cluster/kustomize/base/redis-leader-service.yaml new file mode 100644 index 00000000..4c124f04 --- /dev/null +++ b/single-cluster/kustomize/base/redis-leader-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-leader + labels: + app: redis + role: leader + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: leader + tier: backend diff --git a/single-cluster/kustomize/base/redis-master-deployment.yaml b/single-cluster/kustomize/base/redis-master-deployment.yaml deleted file mode 100644 index d815405b..00000000 --- a/single-cluster/kustomize/base/redis-master-deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis-master -spec: - selector: - matchLabels: - app: redis - role: master - tier: backend - replicas: 1 - template: - metadata: - labels: - app: redis - role: master - tier: backend - spec: - containers: - - name: master - image: registry.k8s.io/redis:e2e - resources: - requests: - cpu: 100m - memory: 100Mi - ports: - - containerPort: 6379 diff --git a/single-cluster/kustomize/base/redis-master-service.yaml b/single-cluster/kustomize/base/redis-master-service.yaml deleted file mode 100644 index a484014f..00000000 --- a/single-cluster/kustomize/base/redis-master-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - app: redis - role: master - tier: backend -spec: - ports: - - port: 6379 - targetPort: 6379 - selector: - app: redis - role: master - tier: backend diff --git a/single-cluster/kustomize/overlays/dev/kustomization.yaml b/single-cluster/kustomize/overlays/dev/kustomization.yaml index ee8993de..01c179d4 100644 --- a/single-cluster/kustomize/overlays/dev/kustomization.yaml +++ b/single-cluster/kustomize/overlays/dev/kustomization.yaml @@ -1,5 +1,5 @@ bases: - ../../base patchesStrategicMerge: -- redis-slave-deployment.yaml -- redis-slave-service.yaml +- redis-follower-deployment.yaml +- redis-follower-service.yaml diff --git a/single-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml b/single-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml similarity index 74% rename from single-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml rename to single-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml index 238ee8c0..ea7fcaf0 100644 --- a/single-cluster/kustomize/overlays/dev/redis-slave-deployment.yaml +++ b/single-cluster/kustomize/overlays/dev/redis-follower-deployment.yaml @@ -1,6 +1,6 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 diff --git a/multi-cluster/kustomize/overlays/dev/redis-slave-service.yaml b/single-cluster/kustomize/overlays/dev/redis-follower-service.yaml similarity index 58% rename from multi-cluster/kustomize/overlays/dev/redis-slave-service.yaml rename to single-cluster/kustomize/overlays/dev/redis-follower-service.yaml index d2a93da3..9a1dc21b 100644 --- a/multi-cluster/kustomize/overlays/dev/redis-slave-service.yaml +++ b/single-cluster/kustomize/overlays/dev/redis-follower-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master + role: leader diff --git a/single-cluster/manifests/deployments/redis-follower-deployment.yaml b/single-cluster/manifests/deployments/redis-follower-deployment.yaml new file mode 100644 index 00000000..96b47bf5 --- /dev/null +++ b/single-cluster/manifests/deployments/redis-follower-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis-follower +spec: + selector: + matchLabels: + app: redis + role: follower + tier: backend + replicas: 2 + template: + metadata: + labels: + app: redis + role: follower + tier: backend + spec: + containers: + - name: follower + image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/single-cluster/manifests/deployments/redis-leader-deployment.yaml b/single-cluster/manifests/deployments/redis-leader-deployment.yaml new file mode 100644 index 00000000..85cdbd27 --- /dev/null +++ b/single-cluster/manifests/deployments/redis-leader-deployment.yaml @@ -0,0 +1,27 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: redis-leader +spec: + selector: + matchLabels: + app: redis + role: leader + tier: backend + replicas: 1 + template: + metadata: + labels: + app: redis + role: leader + tier: backend + spec: + containers: + - name: leader + image: registry.k8s.io/redis:e2e + resources: + requests: + cpu: 100m + memory: 100Mi + ports: + - containerPort: 6379 diff --git a/single-cluster/manifests/deployments/redis-master-deployment.yaml b/single-cluster/manifests/deployments/redis-master-deployment.yaml deleted file mode 100644 index d815405b..00000000 --- a/single-cluster/manifests/deployments/redis-master-deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis-master -spec: - selector: - matchLabels: - app: redis - role: master - tier: backend - replicas: 1 - template: - metadata: - labels: - app: redis - role: master - tier: backend - spec: - containers: - - name: master - image: registry.k8s.io/redis:e2e - resources: - requests: - cpu: 100m - memory: 100Mi - ports: - - containerPort: 6379 diff --git a/single-cluster/manifests/deployments/redis-slave-deployment.yaml b/single-cluster/manifests/deployments/redis-slave-deployment.yaml deleted file mode 100644 index 7b75d355..00000000 --- a/single-cluster/manifests/deployments/redis-slave-deployment.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: redis-slave -spec: - selector: - matchLabels: - app: redis - role: slave - tier: backend - replicas: 2 - template: - metadata: - labels: - app: redis - role: slave - tier: backend - spec: - containers: - - name: slave - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - resources: - requests: - cpu: 100m - memory: 100Mi - ports: - - containerPort: 6379 diff --git a/single-cluster/manifests/services/redis-follower-service.yaml b/single-cluster/manifests/services/redis-follower-service.yaml new file mode 100644 index 00000000..b19fd8ce --- /dev/null +++ b/single-cluster/manifests/services/redis-follower-service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-follower + labels: + app: redis + role: follower + tier: backend +spec: + ports: + - port: 6379 + selector: + app: redis + role: follower + tier: backend diff --git a/single-cluster/manifests/services/redis-leader-service.yaml b/single-cluster/manifests/services/redis-leader-service.yaml new file mode 100644 index 00000000..4c124f04 --- /dev/null +++ b/single-cluster/manifests/services/redis-leader-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + name: redis-leader + labels: + app: redis + role: leader + tier: backend +spec: + ports: + - port: 6379 + targetPort: 6379 + selector: + app: redis + role: leader + tier: backend diff --git a/single-cluster/manifests/services/redis-master-service.yaml b/single-cluster/manifests/services/redis-master-service.yaml deleted file mode 100644 index a484014f..00000000 --- a/single-cluster/manifests/services/redis-master-service.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - app: redis - role: master - tier: backend -spec: - ports: - - port: 6379 - targetPort: 6379 - selector: - app: redis - role: master - tier: backend diff --git a/single-cluster/manifests/services/redis-slave-service.yaml b/single-cluster/manifests/services/redis-slave-service.yaml deleted file mode 100644 index 238fd63f..00000000 --- a/single-cluster/manifests/services/redis-slave-service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-slave - labels: - app: redis - role: slave - tier: backend -spec: - ports: - - port: 6379 - selector: - app: redis - role: slave - tier: backend diff --git a/tests/expected/multi-cluster/helm-external/bundle.yaml b/tests/expected/multi-cluster/helm-external/bundle.yaml index 7ad88c4f..fc2e7f6f 100644 --- a/tests/expected/multi-cluster/helm-external/bundle.yaml +++ b/tests/expected/multi-cluster/helm-external/bundle.yaml @@ -66,23 +66,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: redis resources: requests: @@ -90,15 +90,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -106,31 +106,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -139,15 +139,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -155,12 +155,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-service.yaml - content: | replication: true replicas: 1 diff --git a/tests/expected/multi-cluster/helm-external/dev-output.yaml b/tests/expected/multi-cluster/helm-external/dev-output.yaml index f492cecd..d98af429 100644 --- a/tests/expected/multi-cluster/helm-external/dev-output.yaml +++ b/tests/expected/multi-cluster/helm-external/dev-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-external-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm-external/prod-output.yaml b/tests/expected/multi-cluster/helm-external/prod-output.yaml index d3b2dc2b..256c0ba3 100644 --- a/tests/expected/multi-cluster/helm-external/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-external/prod-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-external-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-external-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm-external/test-output.yaml b/tests/expected/multi-cluster/helm-external/test-output.yaml index 30a1516f..b83dcd10 100644 --- a/tests/expected/multi-cluster/helm-external/test-output.yaml +++ b/tests/expected/multi-cluster/helm-external/test-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-external-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-external-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-external-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml index 87bbbdee..925a5d09 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -66,23 +66,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: redis resources: requests: @@ -90,15 +90,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -106,31 +106,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -139,15 +139,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -155,12 +155,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-service.yaml - content: | replication: true replicas: 1 @@ -234,26 +234,26 @@ spec: name: fleet.yaml - content: | patchesStrategicMerge: - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: overlays/dev/kustomization.yaml - content: | kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 - name: overlays/dev/redis-slave-deployment.yaml + name: overlays/dev/redis-follower-deployment.yaml - content: | kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master - name: overlays/dev/redis-slave-service.yaml + role: leader + name: overlays/dev/redis-follower-service.yaml - content: | apiVersion: apps/v1 kind: Deployment diff --git a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml index 6ef10944..3ba43f61 100644 --- a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml index 1c139f79..276573a6 100644 --- a/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/prod-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml index 214b91e5..bf3bfa52 100644 --- a/tests/expected/multi-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/test-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-kustomize-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index 6bb5e6cc..e6d9a013 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -132,23 +132,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -156,15 +156,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: templates/redis-master-deployment.yaml + name: templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -172,31 +172,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: templates/redis-master-service.yaml + name: templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -205,15 +205,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: templates/redis-slave-deployment.yaml + name: templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -221,12 +221,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: templates/redis-slave-service.yaml + name: templates/redis-follower-service.yaml - content: | replication: true replicas: 1 diff --git a/tests/expected/multi-cluster/helm/dev-output.yaml b/tests/expected/multi-cluster/helm/dev-output.yaml index f80580fa..2d2a6aae 100644 --- a/tests/expected/multi-cluster/helm/dev-output.yaml +++ b/tests/expected/multi-cluster/helm/dev-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml index 768d1234..875fedcd 100644 --- a/tests/expected/multi-cluster/helm/prod-output.yaml +++ b/tests/expected/multi-cluster/helm/prod-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/helm/test-output.yaml b/tests/expected/multi-cluster/helm/test-output.yaml index ff81659f..d03504db 100644 --- a/tests/expected/multi-cluster/helm/test-output.yaml +++ b/tests/expected/multi-cluster/helm/test-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-helm-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index 3a8520a3..bba4fa06 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -96,32 +96,32 @@ spec: resources: - frontend-deployment.yaml - frontend-service.yaml - - redis-master-deployment.yaml - - redis-master-service.yaml - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-leader-deployment.yaml + - redis-leader-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: base/kustomization.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -129,15 +129,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: base/redis-master-deployment.yaml + name: base/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -145,30 +145,30 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: base/redis-master-service.yaml + name: base/redis-leader-service.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -176,24 +176,24 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: base/redis-slave-deployment.yaml + name: base/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend - name: base/redis-slave-service.yaml + name: base/redis-follower-service.yaml - content: | namespace: fleet-mc-kustomize-example targetCustomizations: @@ -222,26 +222,26 @@ spec: resources: - ../../base patchesStrategicMerge: - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: overlays/dev/kustomization.yaml - content: | kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 - name: overlays/dev/redis-slave-deployment.yaml + name: overlays/dev/redis-follower-deployment.yaml - content: | kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master - name: overlays/dev/redis-slave-service.yaml + role: leader + name: overlays/dev/redis-follower-service.yaml - content: | apiVersion: apps/v1 kind: Deployment diff --git a/tests/expected/multi-cluster/kustomize/dev-output.yaml b/tests/expected/multi-cluster/kustomize/dev-output.yaml index 02b6a28c..080b3cf6 100644 --- a/tests/expected/multi-cluster/kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/tests/expected/multi-cluster/kustomize/prod-output.yaml b/tests/expected/multi-cluster/kustomize/prod-output.yaml index 88854073..ad1b04ac 100644 --- a/tests/expected/multi-cluster/kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/multi-cluster/kustomize/test-output.yaml b/tests/expected/multi-cluster/kustomize/test-output.yaml index f6d8cb21..3e0a27fb 100644 --- a/tests/expected/multi-cluster/kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/kustomize/test-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index c05e141d..6967debf 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -123,12 +123,12 @@ spec: app: guestbook tier: frontend name: frontend-service.yaml - - name: overlays/noreplication/redis-slave-deployment.yaml + - name: overlays/noreplication/redis-follower-deployment.yaml - content: | spec: selector: - role: master - name: overlays/noreplication/redis-slave-service_patch.yaml + role: leader + name: overlays/noreplication/redis-follower-service_patch.yaml - content: | spec: replicas: 3 @@ -141,23 +141,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -165,15 +165,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: redis-master-deployment.yaml + name: redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -181,30 +181,30 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: redis-master-service.yaml + name: redis-leader-service.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -212,24 +212,24 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: redis-slave-deployment.yaml + name: redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend - name: redis-slave-service.yaml + name: redis-follower-service.yaml targets: - clusterSelector: matchLabels: diff --git a/tests/expected/multi-cluster/manifests/dev-output.yaml b/tests/expected/multi-cluster/manifests/dev-output.yaml index 71190572..89a02856 100644 --- a/tests/expected/multi-cluster/manifests/dev-output.yaml +++ b/tests/expected/multi-cluster/manifests/dev-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -114,14 +114,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-manifest-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/tests/expected/multi-cluster/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml index 766d9b95..26539c7c 100644 --- a/tests/expected/multi-cluster/manifests/prod-output.yaml +++ b/tests/expected/multi-cluster/manifests/prod-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-manifest-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-manifest-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/multi-cluster/manifests/test-output.yaml b/tests/expected/multi-cluster/manifests/test-output.yaml index 05e63a35..bddc13d7 100644 --- a/tests/expected/multi-cluster/manifests/test-output.yaml +++ b/tests/expected/multi-cluster/manifests/test-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-mc-manifest-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-mc-manifest-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-mc-manifest-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/single-cluster/helm-kustomize/bundle.yaml b/tests/expected/single-cluster/helm-kustomize/bundle.yaml index e3ba5b1c..063baf17 100644 --- a/tests/expected/single-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/single-cluster/helm-kustomize/bundle.yaml @@ -68,23 +68,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: redis resources: requests: @@ -92,15 +92,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -108,31 +108,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -141,15 +141,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -157,12 +157,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-follower-service.yaml - content: | replication: true replicas: 1 @@ -201,26 +201,26 @@ spec: name: fleet.yaml - content: | patchesStrategicMerge: - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: overlays/dev/kustomization.yaml - content: | kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 - name: overlays/dev/redis-slave-deployment.yaml + name: overlays/dev/redis-follower-deployment.yaml - content: | kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master - name: overlays/dev/redis-slave-service.yaml + role: leader + name: overlays/dev/redis-follower-service.yaml targets: - clusterGroup: default correctDrift: {} diff --git a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml index 9203c78e..b47fcad0 100644 --- a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml index 9203c78e..b47fcad0 100644 --- a/tests/expected/single-cluster/helm-kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/prod-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/helm-kustomize/test-output.yaml b/tests/expected/single-cluster/helm-kustomize/test-output.yaml index 9203c78e..b47fcad0 100644 --- a/tests/expected/single-cluster/helm-kustomize/test-output.yaml +++ b/tests/expected/single-cluster/helm-kustomize/test-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: redis - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml index 5d271de6..0e26b65a 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -102,23 +102,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -126,15 +126,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: templates/redis-master-deployment.yaml + name: templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -142,31 +142,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: templates/redis-master-service.yaml + name: templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -175,15 +175,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: templates/redis-slave-deployment.yaml + name: templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -191,12 +191,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: templates/redis-slave-service.yaml + name: templates/redis-follower-service.yaml - content: | replication: true replicas: 1 diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index 625df1b6..9a4030e4 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -121,23 +121,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -145,15 +145,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: templates/redis-master-deployment.yaml + name: templates/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -161,31 +161,31 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: templates/redis-master-service.yaml + name: templates/redis-leader-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -194,15 +194,15 @@ spec: ports: - containerPort: 6379 {{ end }} - name: templates/redis-slave-deployment.yaml + name: templates/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: @@ -210,12 +210,12 @@ spec: selector: app: redis {{ if .Values.replication }} - role: slave + role: follower {{ else }} - role: master + role: leader {{ end }} tier: backend - name: templates/redis-slave-service.yaml + name: templates/redis-follower-service.yaml - content: | replication: true replicas: 1 diff --git a/tests/expected/single-cluster/helm/dev-output.yaml b/tests/expected/single-cluster/helm/dev-output.yaml index cfef9c3e..d8ade3e1 100644 --- a/tests/expected/single-cluster/helm/dev-output.yaml +++ b/tests/expected/single-cluster/helm/dev-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/helm/prod-output.yaml b/tests/expected/single-cluster/helm/prod-output.yaml index cfef9c3e..d8ade3e1 100644 --- a/tests/expected/single-cluster/helm/prod-output.yaml +++ b/tests/expected/single-cluster/helm/prod-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/helm/test-output.yaml b/tests/expected/single-cluster/helm/test-output.yaml index cfef9c3e..d8ade3e1 100644 --- a/tests/expected/single-cluster/helm/test-output.yaml +++ b/tests/expected/single-cluster/helm/test-output.yaml @@ -26,9 +26,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: ports: @@ -36,7 +36,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -48,16 +48,16 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend --- @@ -100,25 +100,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-helm-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -134,25 +134,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-helm-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: diff --git a/tests/expected/single-cluster/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index 16684840..9929786c 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -76,32 +76,32 @@ spec: resources: - frontend-deployment.yaml - frontend-service.yaml - - redis-master-deployment.yaml - - redis-master-service.yaml - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-leader-deployment.yaml + - redis-leader-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: base/kustomization.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -109,15 +109,15 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: base/redis-master-deployment.yaml + name: base/redis-leader-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -125,30 +125,30 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: base/redis-master-service.yaml + name: base/redis-leader-service.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -156,24 +156,24 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: base/redis-slave-deployment.yaml + name: base/redis-follower-deployment.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend - name: base/redis-slave-service.yaml + name: base/redis-follower-service.yaml - content: | # This file and all contents in it are OPTIONAL. @@ -195,26 +195,26 @@ spec: bases: - ../../base patchesStrategicMerge: - - redis-slave-deployment.yaml - - redis-slave-service.yaml + - redis-follower-deployment.yaml + - redis-follower-service.yaml name: overlays/dev/kustomization.yaml - content: | kind: Deployment apiVersion: apps/v1 metadata: - name: redis-slave + name: redis-follower spec: replicas: 0 - name: overlays/dev/redis-slave-deployment.yaml + name: overlays/dev/redis-follower-deployment.yaml - content: | kind: Service apiVersion: v1 metadata: - name: redis-slave + name: redis-follower spec: selector: - role: master - name: overlays/dev/redis-slave-service.yaml + role: leader + name: overlays/dev/redis-follower-service.yaml targets: - clusterGroup: default correctDrift: {} diff --git a/tests/expected/single-cluster/kustomize/dev-output.yaml b/tests/expected/single-cluster/kustomize/dev-output.yaml index eb6c3fe9..37185189 100644 --- a/tests/expected/single-cluster/kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/kustomize/dev-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/tests/expected/single-cluster/kustomize/prod-output.yaml b/tests/expected/single-cluster/kustomize/prod-output.yaml index eb6c3fe9..37185189 100644 --- a/tests/expected/single-cluster/kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/kustomize/prod-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/tests/expected/single-cluster/kustomize/test-output.yaml b/tests/expected/single-cluster/kustomize/test-output.yaml index eb6c3fe9..37185189 100644 --- a/tests/expected/single-cluster/kustomize/test-output.yaml +++ b/tests/expected/single-cluster/kustomize/test-output.yaml @@ -57,25 +57,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -92,9 +92,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-kustomize-example spec: ports: @@ -102,7 +102,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -113,25 +113,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: replicas: 0 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-kustomize-example spec: ports: - port: 6379 selector: app: redis - role: master + role: leader tier: backend diff --git a/tests/expected/single-cluster/manifests/bundle.yaml b/tests/expected/single-cluster/manifests/bundle.yaml index dfa165e0..8b964343 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -59,23 +59,23 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - name: redis-master + name: redis-leader spec: selector: matchLabels: app: redis - role: master + role: leader tier: backend replicas: 1 template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - - name: master + - name: leader image: registry.k8s.io/redis:e2e resources: requests: @@ -83,28 +83,28 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: deployments/redis-master-deployment.yaml + name: deployments/redis-leader-deployment.yaml - content: | apiVersion: apps/v1 kind: Deployment metadata: - name: redis-slave + name: redis-follower spec: selector: matchLabels: app: redis - role: slave + role: follower tier: backend replicas: 2 template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - - name: slave + - name: follower image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 resources: requests: @@ -112,7 +112,7 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: deployments/redis-slave-deployment.yaml + name: deployments/redis-follower-deployment.yaml - content: | # This file and all contents in it are OPTIONAL. @@ -141,10 +141,10 @@ spec: apiVersion: v1 kind: Service metadata: - name: redis-master + name: redis-leader labels: app: redis - role: master + role: leader tier: backend spec: ports: @@ -152,26 +152,26 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend - name: services/redis-master-service.yaml + name: services/redis-leader-service.yaml - content: | apiVersion: v1 kind: Service metadata: - name: redis-slave + name: redis-follower labels: app: redis - role: slave + role: follower tier: backend spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend - name: services/redis-slave-service.yaml + name: services/redis-follower-service.yaml targets: - clusterGroup: default correctDrift: {} diff --git a/tests/expected/single-cluster/manifests/dev-output.yaml b/tests/expected/single-cluster/manifests/dev-output.yaml index 6cd94c8b..d2144d31 100644 --- a/tests/expected/single-cluster/manifests/dev-output.yaml +++ b/tests/expected/single-cluster/manifests/dev-output.yaml @@ -37,25 +37,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -71,25 +71,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -126,9 +126,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: ports: @@ -136,7 +136,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/single-cluster/manifests/prod-output.yaml b/tests/expected/single-cluster/manifests/prod-output.yaml index 6cd94c8b..d2144d31 100644 --- a/tests/expected/single-cluster/manifests/prod-output.yaml +++ b/tests/expected/single-cluster/manifests/prod-output.yaml @@ -37,25 +37,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -71,25 +71,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -126,9 +126,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: ports: @@ -136,7 +136,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend diff --git a/tests/expected/single-cluster/manifests/test-output.yaml b/tests/expected/single-cluster/manifests/test-output.yaml index 6cd94c8b..d2144d31 100644 --- a/tests/expected/single-cluster/manifests/test-output.yaml +++ b/tests/expected/single-cluster/manifests/test-output.yaml @@ -37,25 +37,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: replicas: 1 selector: matchLabels: app: redis - role: master + role: leader tier: backend template: metadata: labels: app: redis - role: master + role: leader tier: backend spec: containers: - image: registry.k8s.io/redis:e2e - name: master + name: leader ports: - containerPort: 6379 resources: @@ -71,25 +71,25 @@ metadata: objectset.rio.cattle.io/id: -test labels: objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: replicas: 2 selector: matchLabels: app: redis - role: slave + role: follower tier: backend template: metadata: labels: app: redis - role: slave + role: follower tier: backend spec: containers: - image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2 - name: slave + name: follower ports: - containerPort: 6379 resources: @@ -126,9 +126,9 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: master + role: leader tier: backend - name: redis-master + name: redis-leader namespace: fleet-manifest-example spec: ports: @@ -136,7 +136,7 @@ spec: targetPort: 6379 selector: app: redis - role: master + role: leader tier: backend --- @@ -148,14 +148,14 @@ metadata: labels: app: redis objectset.rio.cattle.io/hash: c0fae66aeeea5c9703d7410307d74609c272103d - role: slave + role: follower tier: backend - name: redis-slave + name: redis-follower namespace: fleet-manifest-example spec: ports: - port: 6379 selector: app: redis - role: slave + role: follower tier: backend