From 225e7e6c2ca7aa0429872f7c5835b5a6d83d2eb3 Mon Sep 17 00:00:00 2001 From: Emiliano Langella Date: Thu, 14 Mar 2024 10:35:18 +0100 Subject: [PATCH] Use new frontend image (#45) Update the image based on new instructions from Google [1], as Container Registry is deprecated [2]. [1]: https://cloud.google.com/kubernetes-engine/docs/tutorials/guestbook [2]: https://cloud.google.com/artifact-registry/docs/transition/transition-from-gcr --- multi-cluster/helm/templates/frontend-deployment.yaml | 2 +- multi-cluster/kustomize/base/frontend-deployment.yaml | 2 +- multi-cluster/manifests/frontend-deployment.yaml | 2 +- .../guestbook/templates/frontend-deployment.yaml | 2 +- single-cluster/helm/templates/frontend-deployment.yaml | 2 +- single-cluster/kustomize/base/frontend-deployment.yaml | 2 +- single-cluster/manifests/deployments/frontend-deployment.yaml | 2 +- tests/expected/multi-cluster/helm/bundle.yaml | 2 +- tests/expected/multi-cluster/helm/dev-output.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/dev-output.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-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 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/multi-cluster/helm/templates/frontend-deployment.yaml b/multi-cluster/helm/templates/frontend-deployment.yaml index 6ef1ed3..9c8b689 100644 --- a/multi-cluster/helm/templates/frontend-deployment.yaml +++ b/multi-cluster/helm/templates/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/multi-cluster/kustomize/base/frontend-deployment.yaml b/multi-cluster/kustomize/base/frontend-deployment.yaml index 1a981e3..a1e7f7b 100644 --- a/multi-cluster/kustomize/base/frontend-deployment.yaml +++ b/multi-cluster/kustomize/base/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/multi-cluster/manifests/frontend-deployment.yaml b/multi-cluster/manifests/frontend-deployment.yaml index 1a981e3..a1e7f7b 100644 --- a/multi-cluster/manifests/frontend-deployment.yaml +++ b/multi-cluster/manifests/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/single-cluster/helm-multi-chart/guestbook/templates/frontend-deployment.yaml b/single-cluster/helm-multi-chart/guestbook/templates/frontend-deployment.yaml index 6ef1ed3..9c8b689 100644 --- a/single-cluster/helm-multi-chart/guestbook/templates/frontend-deployment.yaml +++ b/single-cluster/helm-multi-chart/guestbook/templates/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/single-cluster/helm/templates/frontend-deployment.yaml b/single-cluster/helm/templates/frontend-deployment.yaml index 6ef1ed3..9c8b689 100644 --- a/single-cluster/helm/templates/frontend-deployment.yaml +++ b/single-cluster/helm/templates/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/single-cluster/kustomize/base/frontend-deployment.yaml b/single-cluster/kustomize/base/frontend-deployment.yaml index 1a981e3..a1e7f7b 100644 --- a/single-cluster/kustomize/base/frontend-deployment.yaml +++ b/single-cluster/kustomize/base/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/single-cluster/manifests/deployments/frontend-deployment.yaml b/single-cluster/manifests/deployments/frontend-deployment.yaml index 1a981e3..a1e7f7b 100644 --- a/single-cluster/manifests/deployments/frontend-deployment.yaml +++ b/single-cluster/manifests/deployments/frontend-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/bundle.yaml b/tests/expected/multi-cluster/helm/bundle.yaml index 9d92f58..e3d4914 100644 --- a/tests/expected/multi-cluster/helm/bundle.yaml +++ b/tests/expected/multi-cluster/helm/bundle.yaml @@ -104,7 +104,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/helm/dev-output.yaml b/tests/expected/multi-cluster/helm/dev-output.yaml index 869f614..f80580f 100644 --- a/tests/expected/multi-cluster/helm/dev-output.yaml +++ b/tests/expected/multi-cluster/helm/dev-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/prod-output.yaml b/tests/expected/multi-cluster/helm/prod-output.yaml index 044c633..b36f6f3 100644 --- a/tests/expected/multi-cluster/helm/prod-output.yaml +++ b/tests/expected/multi-cluster/helm/prod-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/test-output.yaml b/tests/expected/multi-cluster/helm/test-output.yaml index 38c9b53..6b970de 100644 --- a/tests/expected/multi-cluster/helm/test-output.yaml +++ b/tests/expected/multi-cluster/helm/test-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/bundle.yaml b/tests/expected/multi-cluster/kustomize/bundle.yaml index 331ac22..df9006d 100644 --- a/tests/expected/multi-cluster/kustomize/bundle.yaml +++ b/tests/expected/multi-cluster/kustomize/bundle.yaml @@ -68,7 +68,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 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 af54295..15e3d74 100644 --- a/tests/expected/multi-cluster/kustomize/dev-output.yaml +++ b/tests/expected/multi-cluster/kustomize/dev-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/prod-output.yaml b/tests/expected/multi-cluster/kustomize/prod-output.yaml index 5adf524..15660f3 100644 --- a/tests/expected/multi-cluster/kustomize/prod-output.yaml +++ b/tests/expected/multi-cluster/kustomize/prod-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/test-output.yaml b/tests/expected/multi-cluster/kustomize/test-output.yaml index cdf50ed..afcb542 100644 --- a/tests/expected/multi-cluster/kustomize/test-output.yaml +++ b/tests/expected/multi-cluster/kustomize/test-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/bundle.yaml b/tests/expected/multi-cluster/manifests/bundle.yaml index 70f30b2..cbadaf3 100644 --- a/tests/expected/multi-cluster/manifests/bundle.yaml +++ b/tests/expected/multi-cluster/manifests/bundle.yaml @@ -99,7 +99,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/multi-cluster/manifests/dev-output.yaml b/tests/expected/multi-cluster/manifests/dev-output.yaml index e2186a8..7119057 100644 --- a/tests/expected/multi-cluster/manifests/dev-output.yaml +++ b/tests/expected/multi-cluster/manifests/dev-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/prod-output.yaml b/tests/expected/multi-cluster/manifests/prod-output.yaml index b780049..3d08203 100644 --- a/tests/expected/multi-cluster/manifests/prod-output.yaml +++ b/tests/expected/multi-cluster/manifests/prod-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/test-output.yaml b/tests/expected/multi-cluster/manifests/test-output.yaml index b7f19c7..6807705 100644 --- a/tests/expected/multi-cluster/manifests/test-output.yaml +++ b/tests/expected/multi-cluster/manifests/test-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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-multi-chart/bundle.yaml b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml index 92d42ee..18d9dfe 100644 --- a/tests/expected/single-cluster/helm-multi-chart/bundle.yaml +++ b/tests/expected/single-cluster/helm-multi-chart/bundle.yaml @@ -74,7 +74,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 resources: requests: cpu: 100m diff --git a/tests/expected/single-cluster/helm/bundle.yaml b/tests/expected/single-cluster/helm/bundle.yaml index 98dafc7..302272e 100644 --- a/tests/expected/single-cluster/helm/bundle.yaml +++ b/tests/expected/single-cluster/helm/bundle.yaml @@ -93,7 +93,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 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 3e906d3..560d92d 100644 --- a/tests/expected/single-cluster/helm/dev-output.yaml +++ b/tests/expected/single-cluster/helm/dev-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/prod-output.yaml b/tests/expected/single-cluster/helm/prod-output.yaml index 3e906d3..560d92d 100644 --- a/tests/expected/single-cluster/helm/prod-output.yaml +++ b/tests/expected/single-cluster/helm/prod-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/test-output.yaml b/tests/expected/single-cluster/helm/test-output.yaml index 3e906d3..560d92d 100644 --- a/tests/expected/single-cluster/helm/test-output.yaml +++ b/tests/expected/single-cluster/helm/test-output.yaml @@ -83,7 +83,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/bundle.yaml b/tests/expected/single-cluster/kustomize/bundle.yaml index 77955bc..8f4f4e9 100644 --- a/tests/expected/single-cluster/kustomize/bundle.yaml +++ b/tests/expected/single-cluster/kustomize/bundle.yaml @@ -48,7 +48,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 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 f3e93a5..dd9138c 100644 --- a/tests/expected/single-cluster/kustomize/dev-output.yaml +++ b/tests/expected/single-cluster/kustomize/dev-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/prod-output.yaml b/tests/expected/single-cluster/kustomize/prod-output.yaml index f3e93a5..dd9138c 100644 --- a/tests/expected/single-cluster/kustomize/prod-output.yaml +++ b/tests/expected/single-cluster/kustomize/prod-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/kustomize/test-output.yaml b/tests/expected/single-cluster/kustomize/test-output.yaml index f3e93a5..dd9138c 100644 --- a/tests/expected/single-cluster/kustomize/test-output.yaml +++ b/tests/expected/single-cluster/kustomize/test-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/bundle.yaml b/tests/expected/single-cluster/manifests/bundle.yaml index 393ecf1..d5cc23c 100644 --- a/tests/expected/single-cluster/manifests/bundle.yaml +++ b/tests/expected/single-cluster/manifests/bundle.yaml @@ -47,7 +47,7 @@ spec: spec: containers: - name: php-redis - image: gcr.io/google-samples/gb-frontend:v5 + image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 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 739f125..92420d3 100644 --- a/tests/expected/single-cluster/manifests/dev-output.yaml +++ b/tests/expected/single-cluster/manifests/dev-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/prod-output.yaml b/tests/expected/single-cluster/manifests/prod-output.yaml index 739f125..92420d3 100644 --- a/tests/expected/single-cluster/manifests/prod-output.yaml +++ b/tests/expected/single-cluster/manifests/prod-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - 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/manifests/test-output.yaml b/tests/expected/single-cluster/manifests/test-output.yaml index 739f125..92420d3 100644 --- a/tests/expected/single-cluster/manifests/test-output.yaml +++ b/tests/expected/single-cluster/manifests/test-output.yaml @@ -20,7 +20,7 @@ spec: tier: frontend spec: containers: - - image: gcr.io/google-samples/gb-frontend:v5 + - image: us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5 name: php-redis ports: - containerPort: 80