From 16e1c91b4d2e31bb1ed72173c908ad9eef828688 Mon Sep 17 00:00:00 2001 From: Nim Jayawardena Date: Fri, 25 Oct 2024 16:03:02 -0400 Subject: [PATCH] Add "sample-public-image-"prefixed tags to images (#1473) * Add "sample-public-image-"prefixed tags to images * Replace -tag with -${SHORT_SHA} SHORT_SHA = the first 7 characters of the commit SHA * Use ${SHORT_SHA} for all tags --- batch/aiml-workloads/src/cloudbuild.yaml | 3 +++ .../metrics-exporter/cloudbuild.yaml | 3 +++ databases/cloud-pubsub/cloudbuild.yaml | 6 ++++++ databases/hello-app-cloud-spanner/cloudbuild.yaml | 3 +++ .../stateful-workload-filestore/cloudbuild.yaml | 5 ++++- .../direct-to-sd/cloudbuild.yaml | 6 ++++++ .../google-managed-prometheus/cloudbuild.yaml | 6 ++++++ quickstarts/guestbook/php-redis/cloudbuild.yaml | 6 ++++++ quickstarts/guestbook/redis-follower/cloudbuild.yaml | 6 ++++++ quickstarts/hello-app-cdn/cloudbuild.yaml | 7 +++++++ quickstarts/hello-app-redis/cloudbuild.yaml | 9 ++++++++- quickstarts/hello-app-tls/cloudbuild.yaml | 6 ++++++ quickstarts/hello-app/cloudbuild.yaml | 12 ++++++++++++ quickstarts/whereami/cloudbuild.yaml | 9 +++++++++ security/language-vulns/maven/cloudbuild.yaml | 3 +++ security/wi-secrets/cloudbuild.yaml | 5 ++++- 16 files changed, 92 insertions(+), 3 deletions(-) diff --git a/batch/aiml-workloads/src/cloudbuild.yaml b/batch/aiml-workloads/src/cloudbuild.yaml index 4d7e03660f..0094f9d426 100644 --- a/batch/aiml-workloads/src/cloudbuild.yaml +++ b/batch/aiml-workloads/src/cloudbuild.yaml @@ -22,8 +22,11 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/batch-ml-workload' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/batch-ml-workload:sample-public-image-${SHORT_SHA}' - '.' dir: 'batch/aiml-workloads/src' images: - 'us-docker.pkg.dev/google-samples/containers/gke/batch-ml-workload' + - 'us-docker.pkg.dev/google-samples/containers/gke/batch-ml-workload:sample-public-image-${SHORT_SHA}' diff --git a/cost-optimization/gke-vpa-recommendations/metrics-exporter/cloudbuild.yaml b/cost-optimization/gke-vpa-recommendations/metrics-exporter/cloudbuild.yaml index 61dd635824..b6e18b47a6 100644 --- a/cost-optimization/gke-vpa-recommendations/metrics-exporter/cloudbuild.yaml +++ b/cost-optimization/gke-vpa-recommendations/metrics-exporter/cloudbuild.yaml @@ -22,10 +22,13 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/metrics-exporter' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/metrics-exporter:sample-public-image-${SHORT_SHA}' - '.' dir: 'cost-optimization/gke-vpa-recommendations/metrics-exporter' # Push images. images: - 'us-docker.pkg.dev/google-samples/containers/gke/metrics-exporter' + - 'us-docker.pkg.dev/google-samples/containers/gke/metrics-exporter:sample-public-image-${SHORT_SHA}' diff --git a/databases/cloud-pubsub/cloudbuild.yaml b/databases/cloud-pubsub/cloudbuild.yaml index 2c200a81db..dfc73837e7 100644 --- a/databases/cloud-pubsub/cloudbuild.yaml +++ b/databases/cloud-pubsub/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/pubsub-sample:v2' - '-t' + - 'gcr.io/google-samples/pubsub-sample:sample-public-image-v2-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/pubsub-sample:v2' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/pubsub-sample:sample-public-image-v2-${SHORT_SHA}' - '.' dir: 'databases/cloud-pubsub' images: - 'gcr.io/google-samples/pubsub-sample:v2' + - 'gcr.io/google-samples/pubsub-sample:sample-public-image-v2-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/pubsub-sample:v2' + - 'us-docker.pkg.dev/google-samples/containers/gke/pubsub-sample:sample-public-image-v2-${SHORT_SHA}' diff --git a/databases/hello-app-cloud-spanner/cloudbuild.yaml b/databases/hello-app-cloud-spanner/cloudbuild.yaml index 669fd42f53..7033afc11d 100644 --- a/databases/hello-app-cloud-spanner/cloudbuild.yaml +++ b/databases/hello-app-cloud-spanner/cloudbuild.yaml @@ -22,9 +22,12 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cloud-spanner' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cloud-spanner:sample-public-image-${SHORT_SHA}' - '.' dir: 'databases/hello-app-cloud-spanner' # Push images. images: - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cloud-spanner' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cloud-spanner:sample-public-image-${SHORT_SHA}' diff --git a/databases/stateful-workload-filestore/cloudbuild.yaml b/databases/stateful-workload-filestore/cloudbuild.yaml index da92b1f191..100ce67f2b 100644 --- a/databases/stateful-workload-filestore/cloudbuild.yaml +++ b/databases/stateful-workload-filestore/cloudbuild.yaml @@ -22,9 +22,12 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/stateful-workload' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/stateful-workload:sample-public-image-${SHORT_SHA}' - '.' dir: 'stateful-workload-filestore' # Push images. images: - - 'us-docker.pkg.dev/google-samples/containers/gke/stateful-workload' \ No newline at end of file + - 'us-docker.pkg.dev/google-samples/containers/gke/stateful-workload' + - 'us-docker.pkg.dev/google-samples/containers/gke/stateful-workload:sample-public-image-${SHORT_SHA}' \ No newline at end of file diff --git a/observability/custom-metrics-autoscaling/direct-to-sd/cloudbuild.yaml b/observability/custom-metrics-autoscaling/direct-to-sd/cloudbuild.yaml index 39ab7cf24a..055b061448 100644 --- a/observability/custom-metrics-autoscaling/direct-to-sd/cloudbuild.yaml +++ b/observability/custom-metrics-autoscaling/direct-to-sd/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/sd-dummy-exporter:v0.3.0' - '-t' + - 'gcr.io/google-samples/sd-dummy-exporter:sample-public-image-v0.3.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/sd-dummy-exporter:v0.3.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/sd-dummy-exporter:sample-public-image-v0.3.0-${SHORT_SHA}' - '.' dir: 'observability/custom-metrics-autoscaling/direct-to-sd' images: - 'gcr.io/google-samples/sd-dummy-exporter:v0.3.0' + - 'gcr.io/google-samples/sd-dummy-exporter:sample-public-image-v0.3.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/sd-dummy-exporter:v0.3.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/sd-dummy-exporter:sample-public-image-v0.3.0-${SHORT_SHA}' diff --git a/observability/custom-metrics-autoscaling/google-managed-prometheus/cloudbuild.yaml b/observability/custom-metrics-autoscaling/google-managed-prometheus/cloudbuild.yaml index 45eedc3f1d..8a1833d3a5 100644 --- a/observability/custom-metrics-autoscaling/google-managed-prometheus/cloudbuild.yaml +++ b/observability/custom-metrics-autoscaling/google-managed-prometheus/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/prometheus-dummy-exporter:v0.2.0' - '-t' + - 'gcr.io/google-samples/prometheus-dummy-exporter:sample-public-image-v0.2.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/prometheus-dummy-exporter:v0.2.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/prometheus-dummy-exporter:sample-public-image-v0.2.0-${SHORT_SHA}' - '.' dir: 'observability/custom-metrics-autoscaling/google-managed-prometheus' images: - 'gcr.io/google-samples/prometheus-dummy-exporter:v0.2.0' + - 'gcr.io/google-samples/prometheus-dummy-exporter:sample-public-image-v0.2.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/prometheus-dummy-exporter:v0.2.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/prometheus-dummy-exporter:sample-public-image-v0.2.0-${SHORT_SHA}' diff --git a/quickstarts/guestbook/php-redis/cloudbuild.yaml b/quickstarts/guestbook/php-redis/cloudbuild.yaml index 7f473a6b3f..b36ce473b4 100644 --- a/quickstarts/guestbook/php-redis/cloudbuild.yaml +++ b/quickstarts/guestbook/php-redis/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/gb-frontend:v5' - '-t' + - 'gcr.io/google-samples/gb-frontend:sample-public-image-v5-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:sample-public-image-v5-${SHORT_SHA}' - '.' dir: 'quickstarts/guestbook/php-redis' images: - 'gcr.io/google-samples/gb-frontend:v5' + - 'gcr.io/google-samples/gb-frontend:sample-public-image-v5-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:v5' + - 'us-docker.pkg.dev/google-samples/containers/gke/gb-frontend:sample-public-image-v5-${SHORT_SHA}' diff --git a/quickstarts/guestbook/redis-follower/cloudbuild.yaml b/quickstarts/guestbook/redis-follower/cloudbuild.yaml index ded967660a..090f6b6b3a 100644 --- a/quickstarts/guestbook/redis-follower/cloudbuild.yaml +++ b/quickstarts/guestbook/redis-follower/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/gb-redis-follower:v2' - '-t' + - 'gcr.io/google-samples/gb-redis-follower:sample-public-image-v2-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:sample-public-image-v2-${SHORT_SHA}' - '.' dir: 'quickstarts/guestbook/redis-follower' images: - 'gcr.io/google-samples/gb-redis-follower:v2' + - 'gcr.io/google-samples/gb-redis-follower:sample-public-image-v2-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:v2' + - 'us-docker.pkg.dev/google-samples/containers/gke/gb-redis-follower:sample-public-image-v2-${SHORT_SHA}' diff --git a/quickstarts/hello-app-cdn/cloudbuild.yaml b/quickstarts/hello-app-cdn/cloudbuild.yaml index 6c83b0bb0c..7f859d5f39 100644 --- a/quickstarts/hello-app-cdn/cloudbuild.yaml +++ b/quickstarts/hello-app-cdn/cloudbuild.yaml @@ -23,10 +23,17 @@ steps: - '-t' - 'gcr.io/google-samples/hello-app-cdn:1.0' - '-t' + - 'gcr.io/google-samples/hello-app-cdn:sample-public-image-1.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cdn:1.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cdn:sample-public-image-1.0-${SHORT_SHA}' - '.' dir: 'quickstarts/hello-app-cdn' images: - 'gcr.io/google-samples/hello-app-cdn:1.0' + - 'gcr.io/google-samples/hello-app-cdn:sample-public-image-1.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cdn:1.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-cdn:sample-public-image-1.0-${SHORT_SHA}' + diff --git a/quickstarts/hello-app-redis/cloudbuild.yaml b/quickstarts/hello-app-redis/cloudbuild.yaml index 4bf0213771..80ee2a275d 100644 --- a/quickstarts/hello-app-redis/cloudbuild.yaml +++ b/quickstarts/hello-app-redis/cloudbuild.yaml @@ -23,10 +23,17 @@ steps: - '-t' - 'gcr.io/google-samples/hello-app-redis:1.0' - '-t' + - 'gcr.io/google-samples/hello-app-redis:sample-public-image-1.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-redis:1.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-redis:sample-public-image-1.0-${SHORT_SHA}' - '.' dir: 'quickstarts/hello-app-redis' images: - 'gcr.io/google-samples/hello-app-redis:1.0' - - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-redis:1.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-redis:sample-public-image-1.0-${SHORT_SHA}' + - 'gcr.io/google-samples/hello-app-redis:1.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-redis:sample-public-image-1.0-${SHORT_SHA}' + diff --git a/quickstarts/hello-app-tls/cloudbuild.yaml b/quickstarts/hello-app-tls/cloudbuild.yaml index fffeb5e408..5140e48d40 100644 --- a/quickstarts/hello-app-tls/cloudbuild.yaml +++ b/quickstarts/hello-app-tls/cloudbuild.yaml @@ -23,10 +23,16 @@ steps: - '-t' - 'gcr.io/google-samples/hello-app-tls:1.0' - '-t' + - 'gcr.io/google-samples/hello-app-tls:sample-public-image-1.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-tls:1.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-tls:sample-public-image-1.0-${SHORT_SHA}' - '.' dir: 'quickstarts/hello-app-tls' images: - 'gcr.io/google-samples/hello-app-tls:1.0' + - 'gcr.io/google-samples/hello-app-tls:sample-public-image-1.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-tls:1.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app-tls:sample-public-image-1.0-${SHORT_SHA}' diff --git a/quickstarts/hello-app/cloudbuild.yaml b/quickstarts/hello-app/cloudbuild.yaml index b22c800d6a..20ad908831 100644 --- a/quickstarts/hello-app/cloudbuild.yaml +++ b/quickstarts/hello-app/cloudbuild.yaml @@ -25,7 +25,11 @@ steps: - '-t' - 'gcr.io/google-samples/hello-app:1.0' - '-t' + - 'gcr.io/google-samples/hello-app:sample-public-image-1.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:1.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:sample-public-image-1.0-${SHORT_SHA}' - '.' dir: 'quickstarts/hello-app' @@ -42,13 +46,21 @@ steps: - '-t' - 'gcr.io/google-samples/hello-app:2.0' - '-t' + - 'gcr.io/google-samples/hello-app:sample-public-image-2.0-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:2.0' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:sample-public-image-2.0-${SHORT_SHA}' - '.' dir: 'quickstarts/hello-app' # Push images. images: - 'gcr.io/google-samples/hello-app:1.0' + - 'gcr.io/google-samples/hello-app:sample-public-image-1.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:1.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:sample-public-image-1.0-${SHORT_SHA}' - 'gcr.io/google-samples/hello-app:2.0' + - 'gcr.io/google-samples/hello-app:sample-public-image-2.0-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:2.0' + - 'us-docker.pkg.dev/google-samples/containers/gke/hello-app:sample-public-image-2.0-${SHORT_SHA}' \ No newline at end of file diff --git a/quickstarts/whereami/cloudbuild.yaml b/quickstarts/whereami/cloudbuild.yaml index 7aa2e35bd0..83d41dd201 100644 --- a/quickstarts/whereami/cloudbuild.yaml +++ b/quickstarts/whereami/cloudbuild.yaml @@ -23,9 +23,15 @@ steps: - '-t' - 'gcr.io/google-samples/whereami:v1.2.23' - '-t' + - 'gcr.io/google-samples/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' + - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/whereami:v1.2.23' - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' + - '-t' - 'europe-docker.pkg.dev/google-samples/containers/gke/whereami:v1.2.23' + - '-t' + - 'europe-docker.pkg.dev/google-samples/containers/gke/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' - '.' dir: 'quickstarts/whereami' - name: ubuntu @@ -39,5 +45,8 @@ steps: images: - 'gcr.io/google-samples/whereami:v1.2.23' + - 'gcr.io/google-samples/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' - 'us-docker.pkg.dev/google-samples/containers/gke/whereami:v1.2.23' + - 'us-docker.pkg.dev/google-samples/containers/gke/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' - 'europe-docker.pkg.dev/google-samples/containers/gke/whereami:v1.2.23' + - 'europe-docker.pkg.dev/google-samples/containers/gke/whereami:sample-public-image-v1.2.23-${SHORT_SHA}' diff --git a/security/language-vulns/maven/cloudbuild.yaml b/security/language-vulns/maven/cloudbuild.yaml index f1c275123f..f7e6bd3af1 100644 --- a/security/language-vulns/maven/cloudbuild.yaml +++ b/security/language-vulns/maven/cloudbuild.yaml @@ -22,8 +22,11 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/security/maven-vulns' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/security/maven-vulns:sample-public-image-${SHORT_SHA}' - '.' dir: 'security/language-vulns/maven' images: - 'us-docker.pkg.dev/google-samples/containers/gke/security/maven-vulns' + - 'us-docker.pkg.dev/google-samples/containers/gke/security/maven-vulns:sample-public-image-${SHORT_SHA}' diff --git a/security/wi-secrets/cloudbuild.yaml b/security/wi-secrets/cloudbuild.yaml index 7871581058..2a4e97fcf1 100644 --- a/security/wi-secrets/cloudbuild.yaml +++ b/security/wi-secrets/cloudbuild.yaml @@ -22,9 +22,12 @@ steps: - 'build' - '-t' - 'us-docker.pkg.dev/google-samples/containers/gke/wi-secret-store' + - '-t' + - 'us-docker.pkg.dev/google-samples/containers/gke/wi-secret-store:sample-public-image-${SHORT_SHA}' - '.' dir: 'security/wi-secrets' # Push images. images: - - 'us-docker.pkg.dev/google-samples/containers/gke/wi-secret-store' \ No newline at end of file + - 'us-docker.pkg.dev/google-samples/containers/gke/wi-secret-store' + - 'us-docker.pkg.dev/google-samples/containers/gke/wi-secret-store:sample-public-image-${SHORT_SHA}' \ No newline at end of file