From 5ab30f4c9acd822d4704ff5a170cd6f0283a9366 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 31 Aug 2021 01:50:28 -0400 Subject: [PATCH] images: Update gcb-docker-cloud image to v20210722-085d930 Signed-off-by: Stephen Augustus --- cmd/vulndash/cloudbuild.yaml | 4 +++- dependencies.yaml | 19 +++++++++++++++++++ images/build/cross/cloudbuild.yaml | 2 +- images/build/debian-base/cloudbuild.yaml | 4 +++- images/build/debian-iptables/cloudbuild.yaml | 4 +++- images/build/go-runner/cloudbuild.yaml | 4 +++- images/build/setcap/cloudbuild.yaml | 5 ++++- images/releng/k8s-ci-builder/cloudbuild.yaml | 2 +- 8 files changed, 37 insertions(+), 7 deletions(-) diff --git a/cmd/vulndash/cloudbuild.yaml b/cmd/vulndash/cloudbuild.yaml index adea9123aec0..ba84df3c01c4 100644 --- a/cmd/vulndash/cloudbuild.yaml +++ b/cmd/vulndash/cloudbuild.yaml @@ -2,13 +2,15 @@ # this must be specified in seconds. If omitted, defaults to 600s (10 mins) timeout: 1200s + # this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF, # or any new substitutions added in the future. options: substitution_option: ALLOW_LOOSE machineType: 'N1_HIGHCPU_8' + steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: 'bash' dir: ./cmd/vulndash env: diff --git a/dependencies.yaml b/dependencies.yaml index 0c054789f556..b02b7d77039c 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -441,3 +441,22 @@ dependencies: refPaths: - path: images/build/setcap/variants.yaml match: '[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)' + +# Build environments + - name: "gcr.io/k8s-testimages/gcb-docker-gcloud" + version: v20210722-085d930 + refPaths: + - path: cmd/vulndash/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/build/cross/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/build/debian-base/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/build/debian-iptables/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/build/go-runner/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/build/setcap/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" + - path: images/releng/k8s-ci-builder/cloudbuild.yaml + match: "name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v[0-9]{8}-[a-z0-9]{7}'" diff --git a/images/build/cross/cloudbuild.yaml b/images/build/cross/cloudbuild.yaml index db69b730ffec..1a21fa351a0c 100644 --- a/images/build/cross/cloudbuild.yaml +++ b/images/build/cross/cloudbuild.yaml @@ -5,7 +5,7 @@ options: substitution_option: ALLOW_LOOSE steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: 'bash' dir: ./images/build/cross env: diff --git a/images/build/debian-base/cloudbuild.yaml b/images/build/debian-base/cloudbuild.yaml index 3cba8e3eacb3..e9c1b8bc5249 100644 --- a/images/build/debian-base/cloudbuild.yaml +++ b/images/build/debian-base/cloudbuild.yaml @@ -1,10 +1,12 @@ # See https://cloud.google.com/cloud-build/docs/build-config timeout: 1200s + options: substitution_option: ALLOW_LOOSE machineType: 'N1_HIGHCPU_8' + steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: bash dir: ./images/build/debian-base env: diff --git a/images/build/debian-iptables/cloudbuild.yaml b/images/build/debian-iptables/cloudbuild.yaml index b4b5bde4ca2b..4eb397704a5c 100644 --- a/images/build/debian-iptables/cloudbuild.yaml +++ b/images/build/debian-iptables/cloudbuild.yaml @@ -1,10 +1,12 @@ # See https://cloud.google.com/cloud-build/docs/build-config timeout: 1200s + options: substitution_option: ALLOW_LOOSE machineType: 'N1_HIGHCPU_8' + steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: bash dir: ./images/build/debian-iptables env: diff --git a/images/build/go-runner/cloudbuild.yaml b/images/build/go-runner/cloudbuild.yaml index 5bdfbc599dee..a5023ed03338 100644 --- a/images/build/go-runner/cloudbuild.yaml +++ b/images/build/go-runner/cloudbuild.yaml @@ -2,6 +2,7 @@ # this must be specified in seconds. If omitted, defaults to 600s (10 mins) timeout: 1200s + # this prevents errors if you don't use both _GIT_TAG and _PULL_BASE_REF, # or any new substitutions added in the future. options: @@ -16,7 +17,8 @@ steps: - '-key' - 'distroless-cosign.pub' # From https://github.com/GoogleContainerTools/distroless/blob/main/cosign.pub - 'gcr.io/distroless/$_DISTROLESS_IMAGE' - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: 'bash' dir: ./images/build/go-runner env: diff --git a/images/build/setcap/cloudbuild.yaml b/images/build/setcap/cloudbuild.yaml index 645c7645468b..b9f790621e74 100644 --- a/images/build/setcap/cloudbuild.yaml +++ b/images/build/setcap/cloudbuild.yaml @@ -1,10 +1,12 @@ # See https://cloud.google.com/cloud-build/docs/build-config timeout: 1200s + options: substitution_option: ALLOW_LOOSE machineType: 'N1_HIGHCPU_8' + steps: - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: bash dir: ./images/build/setcap env: @@ -22,6 +24,7 @@ steps: - | gcloud auth configure-docker && \ make all-push + substitutions: # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and # can be used as a substitution diff --git a/images/releng/k8s-ci-builder/cloudbuild.yaml b/images/releng/k8s-ci-builder/cloudbuild.yaml index a68734fcb0cd..02292d133c35 100644 --- a/images/releng/k8s-ci-builder/cloudbuild.yaml +++ b/images/releng/k8s-ci-builder/cloudbuild.yaml @@ -11,7 +11,7 @@ options: steps: # TODO: Update image version - - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20201130-750d12f' + - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20210722-085d930' entrypoint: 'bash' dir: ./images/releng/k8s-ci-builder env: