From 58b306eacf2e5a5f518ab427e17fcb071f907e51 Mon Sep 17 00:00:00 2001 From: Horst Gutmann Date: Thu, 25 May 2023 09:56:33 +0200 Subject: [PATCH] [v9.4.x] CI: Pin the google/cloud-sdk image (#69041) [v9.4.x] CI: Pin the google/cloud-sdk image (#69037) (cherry picked from commit f22d1d14a0850db3b6d5f8f77908f949e82a91ce) Backport of #69037 --- .drone.yml | 80 +++++++++++++++---------------- scripts/drone/events/release.star | 3 +- scripts/drone/steps/lib.star | 9 ++-- 3 files changed, 47 insertions(+), 45 deletions(-) diff --git a/.drone.yml b/.drone.yml index d5f510159f4..8a87b864cbc 100644 --- a/.drone.yml +++ b/.drone.yml @@ -612,7 +612,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -660,7 +660,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -673,7 +673,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -695,7 +695,7 @@ steps: GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key failure: ignore - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana volumes: - name: docker @@ -1491,7 +1491,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -1573,7 +1573,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -1586,7 +1586,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -1609,7 +1609,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana volumes: - name: docker @@ -1635,7 +1635,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana-oss volumes: - name: docker @@ -2136,7 +2136,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -2149,7 +2149,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -2228,7 +2228,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -2679,7 +2679,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -2692,7 +2692,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -2772,7 +2772,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -3268,7 +3268,7 @@ steps: from_secret: docker_enterprise2_repo GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -3283,7 +3283,7 @@ steps: from_secret: docker_enterprise2_repo GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -3302,7 +3302,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise2 volumes: - name: docker @@ -3326,7 +3326,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-enterprise2 volumes: - name: docker @@ -3409,7 +3409,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-oss volumes: - name: docker @@ -3432,7 +3432,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana volumes: - name: docker @@ -3455,7 +3455,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana-oss volumes: - name: docker @@ -3517,7 +3517,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise volumes: - name: docker @@ -3540,7 +3540,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana-enterprise volumes: - name: docker @@ -3602,7 +3602,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise volumes: - name: docker @@ -3625,7 +3625,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-grafana-enterprise volumes: - name: docker @@ -3677,7 +3677,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise2 volumes: - name: docker @@ -3740,7 +3740,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise2 volumes: - name: docker @@ -4230,7 +4230,7 @@ steps: from_secret: prerelease_bucket GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: gsutil-stat trigger: event: @@ -4495,7 +4495,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -4508,7 +4508,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -4587,7 +4587,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -5108,7 +5108,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -5121,7 +5121,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -5201,7 +5201,7 @@ steps: GITHUB_TOKEN: from_secret: github_token failure: ignore - image: google/cloud-sdk:406.0.0 + image: google/cloud-sdk:431.0.0 name: e2e-tests-artifacts-upload when: status: @@ -5851,7 +5851,7 @@ steps: from_secret: docker_enterprise2_repo GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images volumes: - name: docker @@ -5866,7 +5866,7 @@ steps: from_secret: docker_enterprise2_repo GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: build-docker-images-ubuntu volumes: - name: docker @@ -5885,7 +5885,7 @@ steps: from_secret: docker_username GCP_KEY: from_secret: gcp_key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: fetch-images-enterprise2 volumes: - name: docker @@ -5909,7 +5909,7 @@ steps: from_secret: delivery-bot-app-installation-id GITHUB_APP_PRIVATE_KEY: from_secret: delivery-bot-app-private-key - image: google/cloud-sdk + image: google/cloud-sdk:431.0.0 name: publish-images-enterprise2 volumes: - name: docker @@ -6582,6 +6582,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: c5562c8fd110383aee09c2a4f9570029a57a22f62c03e9c14f44ecf0672efae9 +hmac: a52ed389a9a4106caecbe4de5b54c49f76d48f147fe1ddee70a7d226aa6f46c9 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 7b75eb5af31..3a05ca8e541 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -13,6 +13,7 @@ load( "build_plugins_step", "build_storybook_step", "clone_enterprise_step", + "cloudsdk_image", "compile_build_cmd", "copy_packages_for_docker_step", "download_grabpl_step", @@ -811,7 +812,7 @@ def verify_release_pipeline( step = { "name": "gsutil-stat", "depends_on": ["clone"], - "image": "google/cloud-sdk", + "image": cloudsdk_image, "environment": { "BUCKET": bucket, "GCP_KEY": gcp_key, diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star index deea4303139..c7827275b97 100644 --- a/scripts/drone/steps/lib.star +++ b/scripts/drone/steps/lib.star @@ -9,6 +9,7 @@ load( ) grabpl_version = "v3.0.38" +cloudsdk_image = "google/cloud-sdk:431.0.0" build_image = "grafana/build-container:1.7.4" publish_image = "grafana/grafana-ci-deploy:1.3.3" deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" @@ -410,7 +411,7 @@ def store_storybook_step(ver_mode, trigger = None): def e2e_tests_artifacts(): return { "name": "e2e-tests-artifacts-upload", - "image": "google/cloud-sdk:406.0.0", + "image": cloudsdk_image, "depends_on": [ "end-to-end-tests-dashboards-suite", "end-to-end-tests-panels-suite", @@ -1028,7 +1029,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa return { "name": "build-docker-images" + ubuntu_sfx, - "image": "google/cloud-sdk", + "image": cloudsdk_image, "depends_on": [ "copy-packages-for-docker", "compile-build-cmd", @@ -1041,7 +1042,7 @@ def build_docker_images_step(edition, archs = None, ubuntu = False, publish = Fa def fetch_images_step(edition): return { "name": "fetch-images-{}".format(edition), - "image": "google/cloud-sdk", + "image": cloudsdk_image, "environment": { "GCP_KEY": from_secret("gcp_key"), "DOCKER_USER": from_secret("docker_username"), @@ -1120,7 +1121,7 @@ def publish_images_step(edition, ver_mode, mode, docker_repo, trigger = None): step = { "name": "publish-images-{}".format(name), - "image": "google/cloud-sdk", + "image": cloudsdk_image, "environment": environment, "commands": [cmd], "depends_on": deps,