Merge pull request #49 from rancher/multiarch

Switch Redis image to official one
rancher · Sep 2, 2024 · 660a9f6 · 660a9f6
2 parents 2ada7cc + 0cf04e6
commit 660a9f6
Show file tree

Hide file tree

Showing 41 changed files with 64 additions and 64 deletions.
diff --git a/multi-cluster/helm/templates/redis-master-deployment.yaml b/multi-cluster/helm/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/multi-cluster/helm/templates/redis-slave-deployment.yaml b/multi-cluster/helm/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/multi-cluster/kustomize/base/redis-master-deployment.yaml b/multi-cluster/kustomize/base/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/multi-cluster/kustomize/base/redis-slave-deployment.yaml b/multi-cluster/kustomize/base/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/multi-cluster/manifests/redis-master-deployment.yaml b/multi-cluster/manifests/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/multi-cluster/manifests/redis-slave-deployment.yaml b/multi-cluster/manifests/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/simple/redis-master-deployment.yaml b/simple/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/simple/redis-slave-deployment.yaml b/simple/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/helm/templates/redis-master-deployment.yaml b/single-cluster/helm/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/helm/templates/redis-slave-deployment.yaml b/single-cluster/helm/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/kustomize/base/redis-master-deployment.yaml b/single-cluster/kustomize/base/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/kustomize/base/redis-slave-deployment.yaml b/single-cluster/kustomize/base/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/manifests/deployments/redis-master-deployment.yaml b/single-cluster/manifests/deployments/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: registry.k8s.io/redis:e2e
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/single-cluster/manifests/deployments/redis-slave-deployment.yaml b/single-cluster/manifests/deployments/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v2
+        image: redis
         resources:
           requests:
             cpu: 100m

diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml
@@ -149,7 +149,7 @@ spec:
           spec:
             containers:
             - name: master
-              image: registry.k8s.io/redis:e2e
+              image: redis
               resources:
                 requests:
                   cpu: 100m
@@ -197,7 +197,7 @@ spec:
           spec:
             containers:
             - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v2
+              image: redis
               resources:
                 requests:
                   cpu: 100m

diff --git a/tests/expected/multi-cluster/helm/dev-output.yaml b/tests/expected/multi-cluster/helm/dev-output.yaml
@@ -117,7 +117,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/helm/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml
@@ -117,7 +117,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/helm/test-output.yaml b/tests/expected/multi-cluster/helm/test-output.yaml
@@ -117,7 +117,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml
@@ -122,7 +122,7 @@ spec:
           spec:
             containers:
             - name: master
-              image: registry.k8s.io/redis:e2e
+              image: redis
               resources:
                 requests:
                   cpu: 100m
@@ -169,7 +169,7 @@ spec:
           spec:
             containers:
             - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v2
+              image: redis
               resources:
                 requests:
                   cpu: 100m

diff --git a/tests/expected/multi-cluster/kustomize/dev-output.yaml b/tests/expected/multi-cluster/kustomize/dev-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/kustomize/prod-output.yaml b/tests/expected/multi-cluster/kustomize/prod-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/kustomize/test-output.yaml b/tests/expected/multi-cluster/kustomize/test-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml
@@ -158,7 +158,7 @@ spec:
           spec:
             containers:
             - name: master
-              image: registry.k8s.io/redis:e2e
+              image: redis
               resources:
                 requests:
                   cpu: 100m
@@ -205,7 +205,7 @@ spec:
           spec:
             containers:
             - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v2
+              image: redis
               resources:
                 requests:
                   cpu: 100m

diff --git a/tests/expected/multi-cluster/manifests/dev-output.yaml b/tests/expected/multi-cluster/manifests/dev-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/multi-cluster/manifests/test-output.yaml b/tests/expected/multi-cluster/manifests/test-output.yaml
@@ -74,7 +74,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379

diff --git a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml
@@ -119,7 +119,7 @@ spec:
           spec:
             containers:
             - name: master
-              image: registry.k8s.io/redis:e2e
+              image: redis
               resources:
                 requests:
                   cpu: 100m
@@ -167,7 +167,7 @@ spec:
           spec:
             containers:
             - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v2
+              image: redis
               resources:
                 requests:
                   cpu: 100m

diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml
@@ -138,7 +138,7 @@ spec:
           spec:
             containers:
             - name: master
-              image: registry.k8s.io/redis:e2e
+              image: redis
               resources:
                 requests:
                   cpu: 100m
@@ -186,7 +186,7 @@ spec:
           spec:
             containers:
             - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v2
+              image: redis
               resources:
                 requests:
                   cpu: 100m

diff --git a/tests/expected/single-cluster/helm/dev-output.yaml b/tests/expected/single-cluster/helm/dev-output.yaml
@@ -117,7 +117,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: registry.k8s.io/redis:e2e
+      - image: redis
         name: master
         ports:
         - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
         tier: backend
     spec:
       containers:
-      - image: gcr.io/google_samples/gb-redisslave:v2
+      - image: redis
         name: slave
         ports:
         - containerPort: 6379