From 505ed1a6b2e839586d20dfa717142e2100ad69aa Mon Sep 17 00:00:00 2001 From: Xavi Garcia Date: Tue, 27 May 2025 16:29:39 +0200 Subject: [PATCH] update expected fixtures --- .../multi-cluster/helm-external/bundle.yaml | 24 +++++++++---------- .../helm-external/dev-output.yaml | 2 +- .../helm-external/prod-output.yaml | 4 ++-- .../helm-external/test-output.yaml | 4 ++-- .../multi-cluster/helm-kustomize/bundle.yaml | 24 +++++++++---------- .../helm-kustomize/dev-output.yaml | 4 ++-- .../helm-kustomize/prod-output.yaml | 4 ++-- .../helm-kustomize/test-output.yaml | 4 ++-- .../single-cluster/helm-kustomize/bundle.yaml | 24 +++++++++---------- .../helm-kustomize/dev-output.yaml | 4 ++-- .../helm-kustomize/prod-output.yaml | 4 ++-- .../helm-kustomize/test-output.yaml | 4 ++-- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/tests/expected/multi-cluster/helm-external/bundle.yaml b/tests/expected/multi-cluster/helm-external/bundle.yaml index cf147c6..872aad7 100644 --- a/tests/expected/multi-cluster/helm-external/bundle.yaml +++ b/tests/expected/multi-cluster/helm-external/bundle.yaml @@ -14,11 +14,11 @@ spec: resources: - content: | apiVersion: v2 - appVersion: 0.0.0 + appVersion: 0.0.1 description: Sample application name: guestbook - version: 0.0.0 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/Chart.yaml + version: 0.0.1 + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/Chart.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -38,14 +38,14 @@ 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 memory: 100Mi ports: - containerPort: 80 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -61,7 +61,7 @@ spec: selector: app: guestbook tier: frontend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-service.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -90,7 +90,7 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -108,7 +108,7 @@ spec: app: redis role: master tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 @@ -131,7 +131,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: redis resources: requests: cpu: 100m @@ -139,7 +139,7 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -160,12 +160,12 @@ spec: role: master {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-service.yaml - content: | replication: true replicas: 1 serviceType: NodePort - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/values.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/values.yaml - content: | # Multi-Cluster Helm External Example diff --git a/tests/expected/multi-cluster/helm-external/dev-output.yaml b/tests/expected/multi-cluster/helm-external/dev-output.yaml index 2159838..f492cec 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 8e3ebf0..a1c9265 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 fbf2b79..14ebc2e 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 5008305..d26c681 100644 --- a/tests/expected/multi-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/helm-kustomize/bundle.yaml @@ -14,11 +14,11 @@ spec: resources: - content: | apiVersion: v2 - appVersion: 0.0.0 + appVersion: 0.0.1 description: Sample application name: guestbook - version: 0.0.0 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/Chart.yaml + version: 0.0.1 + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/Chart.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -38,14 +38,14 @@ 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 memory: 100Mi ports: - containerPort: 80 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -61,7 +61,7 @@ spec: selector: app: guestbook tier: frontend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-service.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -90,7 +90,7 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -108,7 +108,7 @@ spec: app: redis role: master tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 @@ -131,7 +131,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: redis resources: requests: cpu: 100m @@ -139,7 +139,7 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -160,12 +160,12 @@ spec: role: master {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-service.yaml - content: | replication: true replicas: 1 serviceType: NodePort - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/values.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/values.yaml - content: | # Multi-Cluster Helm Kustomize Example diff --git a/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml b/tests/expected/multi-cluster/helm-kustomize/dev-output.yaml index 7d52f73..1910980 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 5ddc155..5e8c3db 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 a8da5ef..9232619 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 00e104e..51ceccc 100644 --- a/tests/expected/single-cluster/helm-kustomize/bundle.yaml +++ b/tests/expected/single-cluster/helm-kustomize/bundle.yaml @@ -16,11 +16,11 @@ spec: resources: - content: | apiVersion: v2 - appVersion: 0.0.0 + appVersion: 0.0.1 description: Sample application name: guestbook - version: 0.0.0 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/Chart.yaml + version: 0.0.1 + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/Chart.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -40,14 +40,14 @@ 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 memory: 100Mi ports: - containerPort: 80 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -63,7 +63,7 @@ spec: selector: app: guestbook tier: frontend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/frontend-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/frontend-service.yaml - content: | apiVersion: apps/v1 kind: Deployment @@ -92,7 +92,7 @@ spec: memory: 100Mi ports: - containerPort: 6379 - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -110,7 +110,7 @@ spec: app: redis role: master tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-master-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-master-service.yaml - content: | {{ if .Values.replication }} apiVersion: apps/v1 @@ -133,7 +133,7 @@ spec: spec: containers: - name: slave - image: gcr.io/google_samples/gb-redisslave:v1 + image: redis resources: requests: cpu: 100m @@ -141,7 +141,7 @@ spec: ports: - containerPort: 6379 {{ end }} - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-deployment.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-deployment.yaml - content: | apiVersion: v1 kind: Service @@ -162,12 +162,12 @@ spec: role: master {{ end }} tier: backend - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/templates/redis-slave-service.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/templates/redis-slave-service.yaml - content: | replication: true replicas: 1 serviceType: NodePort - name: .chart/9c24c039ba1d12c3cf62ee27ea13445e44c58e8d9e1df45d0a94a1bcc5a81566/guestbook/values.yaml + name: .chart/ce648b1a536ac8c844ef58f2c3383e621a823acb2be15fa4b0d1cf053709a787/guestbook/values.yaml - content: | # Helm Kustomize Example diff --git a/tests/expected/single-cluster/helm-kustomize/dev-output.yaml b/tests/expected/single-cluster/helm-kustomize/dev-output.yaml index 034c340..cfade0a 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 034c340..cfade0a 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis 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 034c340..cfade0a 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 @@ -151,7 +151,7 @@ spec: tier: backend spec: containers: - - image: gcr.io/google_samples/gb-redisslave:v1 + - image: redis name: slave ports: - containerPort: 6379