Merge pull request #19 from moio/redis_no_vsyscall

Update Redis images to avoid vsyscall use
2022-06-10 15:11:16 +02:00
parent fc1b9b26ca e8da7b6557
commit ffdc8d483b
41 changed files with 66 additions and 66 deletions
--- a/multi-cluster/helm/templates/redis-master-deployment.yaml
+++ b/multi-cluster/helm/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/multi-cluster/helm/templates/redis-slave-deployment.yaml
+++ b/multi-cluster/helm/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/multi-cluster/kustomize/base/redis-master-deployment.yaml
+++ b/multi-cluster/kustomize/base/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/multi-cluster/kustomize/base/redis-slave-deployment.yaml
+++ b/multi-cluster/kustomize/base/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/multi-cluster/manifests/redis-master-deployment.yaml
+++ b/multi-cluster/manifests/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/multi-cluster/manifests/redis-slave-deployment.yaml
+++ b/multi-cluster/manifests/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/simple/redis-master-deployment.yaml
+++ b/simple/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/simple/redis-slave-deployment.yaml
+++ b/simple/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml
+++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml
+++ b/single-cluster/helm-multi-chart/guestbook/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/helm/templates/redis-master-deployment.yaml
+++ b/single-cluster/helm/templates/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/helm/templates/redis-slave-deployment.yaml
+++ b/single-cluster/helm/templates/redis-slave-deployment.yaml
@@ -19,7 +19,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/kustomize/base/redis-master-deployment.yaml
+++ b/single-cluster/kustomize/base/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/kustomize/base/redis-slave-deployment.yaml
+++ b/single-cluster/kustomize/base/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/manifests/deployments/redis-master-deployment.yaml
+++ b/single-cluster/manifests/deployments/redis-master-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: master
-        image: redis
+        image: k8s.gcr.io/redis:e2e
        resources:
          requests:
            cpu: 100m
--- a/single-cluster/manifests/deployments/redis-slave-deployment.yaml
+++ b/single-cluster/manifests/deployments/redis-slave-deployment.yaml
@@ -18,7 +18,7 @@ spec:
    spec:
      containers:
      - name: slave
-        image: gcr.io/google_samples/gb-redisslave:v1
+        image: gcr.io/google_samples/gb-redisslave:v2
        resources:
          requests:
            cpu: 100m
--- a/tests/expected/multi-cluster/helm/bundle.yaml
+++ b/tests/expected/multi-cluster/helm/bundle.yaml
@@ -147,7 +147,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -195,7 +195,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/multi-cluster/helm/dev-output.yaml
+++ b/tests/expected/multi-cluster/helm/dev-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/helm/prod-output.yaml
+++ b/tests/expected/multi-cluster/helm/prod-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/helm/test-output.yaml
+++ b/tests/expected/multi-cluster/helm/test-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/kustomize/bundle.yaml
+++ b/tests/expected/multi-cluster/kustomize/bundle.yaml
@@ -120,7 +120,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -167,7 +167,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/multi-cluster/kustomize/dev-output.yaml
+++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/kustomize/prod-output.yaml
+++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/kustomize/test-output.yaml
+++ b/tests/expected/multi-cluster/kustomize/test-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/manifests/bundle.yaml
+++ b/tests/expected/multi-cluster/manifests/bundle.yaml
@@ -156,7 +156,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -203,7 +203,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/multi-cluster/manifests/dev-output.yaml
+++ b/tests/expected/multi-cluster/manifests/dev-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/manifests/prod-output.yaml
+++ b/tests/expected/multi-cluster/manifests/prod-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/multi-cluster/manifests/test-output.yaml
+++ b/tests/expected/multi-cluster/manifests/test-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml
+++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml
@@ -120,7 +120,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -168,7 +168,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
@@ -380,7 +380,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -428,7 +428,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/single-cluster/helm/bundle.yaml
+++ b/tests/expected/single-cluster/helm/bundle.yaml
@@ -136,7 +136,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -184,7 +184,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/single-cluster/helm/dev-output.yaml
+++ b/tests/expected/single-cluster/helm/dev-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/helm/prod-output.yaml
+++ b/tests/expected/single-cluster/helm/prod-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/helm/test-output.yaml
+++ b/tests/expected/single-cluster/helm/test-output.yaml
@@ -117,7 +117,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -151,7 +151,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/kustomize/bundle.yaml
+++ b/tests/expected/single-cluster/kustomize/bundle.yaml
@@ -100,7 +100,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -147,7 +147,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/single-cluster/kustomize/dev-output.yaml
+++ b/tests/expected/single-cluster/kustomize/dev-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/kustomize/prod-output.yaml
+++ b/tests/expected/single-cluster/kustomize/prod-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/kustomize/test-output.yaml
+++ b/tests/expected/single-cluster/kustomize/test-output.yaml
@@ -74,7 +74,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -130,7 +130,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/manifests/bundle.yaml
+++ b/tests/expected/single-cluster/manifests/bundle.yaml
@@ -74,7 +74,7 @@ spec:
          spec:
            containers:
            - name: master
-              image: redis
+              image: k8s.gcr.io/redis:e2e
              resources:
                requests:
                  cpu: 100m
@@ -103,7 +103,7 @@ spec:
          spec:
            containers:
            - name: slave
-              image: gcr.io/google_samples/gb-redisslave:v1
+              image: gcr.io/google_samples/gb-redisslave:v2
              resources:
                requests:
                  cpu: 100m
--- a/tests/expected/single-cluster/manifests/dev-output.yaml
+++ b/tests/expected/single-cluster/manifests/dev-output.yaml
@@ -54,7 +54,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -88,7 +88,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/manifests/prod-output.yaml
+++ b/tests/expected/single-cluster/manifests/prod-output.yaml
@@ -54,7 +54,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -88,7 +88,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379
--- a/tests/expected/single-cluster/manifests/test-output.yaml
+++ b/tests/expected/single-cluster/manifests/test-output.yaml
@@ -54,7 +54,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: redis
+      - image: k8s.gcr.io/redis:e2e
        name: master
        ports:
        - containerPort: 6379
@@ -88,7 +88,7 @@ spec:
        tier: backend
    spec:
      containers:
-      - image: gcr.io/google_samples/gb-redisslave:v1
+      - image: gcr.io/google_samples/gb-redisslave:v2
        name: slave
        ports:
        - containerPort: 6379