Use Artifact Registry images

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

multi-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml → 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

single-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml → 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

multi-cluster/helm/templates/redis-slave-deployment.yaml → multi-cluster/helm/templates/redis-follower-deployment.yaml

@@ -2,24 +2,24 @@
 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
- image: gcr.io/google_samples/gb-redisslave:v2
+ - name: follower
+ image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2
  resources:
  requests:
  cpu: 100m

single-cluster/helm-multi-chart/guestbook/templates/redis-slave-service.yaml → multi-cluster/helm/templates/redis-follower-service.yaml

@@ -1,19 +1,19 @@
 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
  {{ if .Values.replication }}
- role: slave
+ role: follower
  {{ else }}
- role: master
+ role: leader
  {{ end }}
  tier: backend

multi-cluster/manifests/redis-master-deployment.yaml → 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:

multi-cluster/manifests/redis-master-service.yaml → multi-cluster/helm/templates/redis-leader-service.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
- name: redis-master
+ name: redis-leader
  labels:
  app: redis
- role: master
+ role: leader
  tier: backend
 spec:
  ports:
  - port: 6379
  targetPort: 6379
  selector:
  app: redis
- role: master
+ role: leader
  tier: backend

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

multi-cluster/kustomize/base/redis-slave-deployment.yaml → multi-cluster/kustomize/base/redis-follower-deployment.yaml

@@ -1,24 +1,24 @@
 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
- image: gcr.io/google_samples/gb-redisslave:v2
+ - name: follower
+ image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2
  resources:
  requests:
  cpu: 100m

multi-cluster/manifests/redis-slave-service.yaml → 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

simple/redis-master-deployment.yaml → 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:

multi-cluster/kustomize/base/redis-master-service.yaml → multi-cluster/kustomize/base/redis-leader-service.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
- name: redis-master
+ name: redis-leader
  labels:
  app: redis
- role: master
+ role: leader
  tier: backend
 spec:
  ports:
  - port: 6379
  targetPort: 6379
  selector:
  app: redis
- role: master
+ role: leader
  tier: backend

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

single-cluster/helm-kustomize/overlays/dev/redis-slave-deployment.yaml → 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

multi-cluster/helm-kustomize/overlays/dev/redis-slave-service.yaml → 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

multi-cluster/manifests/overlays/noreplication/redis-slave-service_patch.yaml → multi-cluster/manifests/overlays/noreplication/redis-follower-service_patch.yaml

@@ -1,3 +1,3 @@
 spec:
  selector:
- role: master
+ role: leader

multi-cluster/manifests/redis-slave-deployment.yaml → multi-cluster/manifests/redis-follower-deployment.yaml

@@ -1,24 +1,24 @@
 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
- image: gcr.io/google_samples/gb-redisslave:v2
+ - name: follower
+ image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2
  resources:
  requests:
  cpu: 100m

simple/redis-slave-service.yaml → 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

multi-cluster/helm/templates/redis-master-deployment.yaml → 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:

simple/redis-master-service.yaml → multi-cluster/manifests/redis-leader-service.yaml

@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
- name: redis-master
+ name: redis-leader
  labels:
  app: redis
- role: master
+ role: leader
  tier: backend
 spec:
  ports:
  - port: 6379
  targetPort: 6379
  selector:
  app: redis
- role: master
+ role: leader
  tier: backend

simple/redis-slave-deployment.yaml → simple/redis-follower-deployment.yaml

@@ -1,24 +1,24 @@
 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
- image: gcr.io/google_samples/gb-redisslave:v2
+ - name: follower
+ image: us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2
  resources:
  requests:
  cpu: 100m