images: Update gcb-docker-cloud image to v20210722-085d930

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:

dependencies.yaml

@@ -285,13 +285,11 @@ dependencies:
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
   # Golang (for previous release branches 1.19/1.20)
-  - name: "golang (for previous release branches)"
+  - name: "golang (for previous release branches 1.19/1.20)"
     version: 1.15.15
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
-    - path: images/build/go-runner/variants.yaml
-      match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
     - path: images/releng/ci/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
@@ -317,8 +315,6 @@ dependencies:
   - name: "k8s.gcr.io/build-image/go-runner (for previous release branches 1.19/1.20)"
     version: v2.3.1-go1.15.15-buster.0
     refPaths:
-    - path: images/build/go-runner/variants.yaml
-      match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
 
   - name: "k8s.gcr.io/build-image/go-runner: image revision (for previous release branches)"
     version: 0
@@ -476,3 +472,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}'"

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:

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:

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:

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:

images/build/go-runner/variants.yaml

@@ -15,11 +15,3 @@ variants:
     REVISION: '0'
     GO_VERSION: '1.16.8'
     DISTROLESS_IMAGE: 'static-debian10'
-  go1.15-buster:
-    CONFIG: 'go1.15-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.15.15-buster.0'
-    GO_MAJOR_VERSION: '1.15'
-    OS_CODENAME: 'buster'
-    REVISION: '0'
-    GO_VERSION: '1.15.15'
-    DISTROLESS_IMAGE: 'static-debian10'

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

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: