[go] Build go1.16.4 and go1.15.12 images

cmd/vulndash/Makefile

@@ -28,7 +28,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
-GO_VERSION ?= 1.16.3
+GO_VERSION ?= 1.16.4
 DISTROLESS_IMAGE ?= static-debian10
 
 PLATFORMS ?= linux/amd64

cmd/vulndash/variants.yaml

@@ -1,5 +1,5 @@
 variants:
   default:
     IMAGE_VERSION: 'v0.4.3-7'
-    GO_VERSION: '1.16.3'
+    GO_VERSION: '1.16.4'
     DISTROLESS_IMAGE: 'static-debian10'

dependencies.yaml

@@ -64,7 +64,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.16.3
+    version: 1.16.4
     refPaths:
     - path: cmd/vulndash/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -107,7 +107,7 @@ dependencies:
 
   # Golang images
   - name: "gcr.io/k8s-staging-releng/releng-ci"
-    version: v0.5.1
+    version: v0.5.2
     refPaths:
     - path: images/releng/ci/cloudbuild.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-]+)*))?)
@@ -121,22 +121,24 @@ dependencies:
       match: v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-([0-9]+)
 
   - name: "k8s.gcr.io/build-image/go-runner"
-    version: v2.3.1-go1.16.3-buster.1
+    version: v2.3.1-go1.16.4-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"
-    version: 1
+    version: 0
     refPaths:
     - path: images/build/go-runner/Makefile
       match: REVISION \?= \d+
     - path: images/build/go-runner/variants.yaml
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross"
-    version: v1.16.3-1
+    version: v1.16.4-1
     refPaths:
+    - path: images/build/cross/Makefile
+      match: IMAGE_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)-([0-9]+)
     - path: images/build/cross/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-]+)*))?)-\d+
 
@@ -156,7 +158,7 @@ dependencies:
 
   # Golang (for previous release branches)
   - name: "golang (for previous release branches)"
-    version: 1.15.11
+    version: 1.15.12
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -174,19 +176,19 @@ dependencies:
 
   # Golang images (for previous release branches)
   - name: "k8s.gcr.io/build-image/go-runner (for previous release branches)"
-    version: v2.3.1-go1.15.11-buster.1
+    version: v2.3.1-go1.15.12-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: 1
+    version: 0
     refPaths:
     - path: images/build/go-runner/variants.yaml
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches)"
-    version: v1.15.11-1
+    version: v1.15.12-1
     refPaths:
     - path: images/build/cross/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-]+)*))?)-\d+

hack/verify-dependencies.sh

@@ -22,8 +22,11 @@ VERSION=v0.3.0
 REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 # Ensure that we find the binaries we build before anything else.
-export GOBIN="${GOPATH}/bin"
-PATH="${GOBIN}:${PATH}"
+gobin=${GOBIN:-$(go env GOBIN)}
+if [[ -z $gobin ]]; then
+  gobin="$(go env GOPATH)/bin"
+fi
+PATH="${gobin}:${PATH}"
 
 # Install zeitgeist
 cd "${REPO_ROOT}/internal"

images/build/cross/Makefile

@@ -16,12 +16,12 @@
 SHELL=/bin/bash -o pipefail
 
 IMGNAME = kube-cross
-IMAGE_VERSION ?= v1.16.2-1
+IMAGE_VERSION ?= v1.16.4-1
 CONFIG ?= go1.16
 TYPE ?= default
 
 # Build args
-GO_VERSION?=1.16.3
+GO_VERSION?=1.16.4
 BASEIMAGE?=golang:$(GO_VERSION)
 PROTOBUF_VERSION?=3.7.0
 ETCD_VERSION?=v3.4.13

images/build/cross/variants.yaml

@@ -2,28 +2,28 @@ variants:
   canary:
     TYPE: 'default'
     CONFIG: 'canary'
-    GO_VERSION: '1.16.3'
-    IMAGE_VERSION: 'v1.16.3-canary-2'
+    GO_VERSION: '1.16.4'
+    IMAGE_VERSION: 'v1.16.4-canary-1'
     PROTOBUF_VERSION: '3.7.0'
     ETCD_VERSION: 'v3.4.13'
   go1.16:
     TYPE: 'default'
     CONFIG: 'go1.16'
-    GO_VERSION: '1.16.3'
-    IMAGE_VERSION: 'v1.16.3-1'
+    GO_VERSION: '1.16.4'
+    IMAGE_VERSION: 'v1.16.4-1'
     PROTOBUF_VERSION: '3.7.0'
     ETCD_VERSION: 'v3.4.13'
   go1.15:
     TYPE: 'default'
     CONFIG: 'go1.15'
-    GO_VERSION: '1.15.11'
-    IMAGE_VERSION: 'v1.15.11-1'
+    GO_VERSION: '1.15.12'
+    IMAGE_VERSION: 'v1.15.12-1'
     PROTOBUF_VERSION: '3.7.0'
     ETCD_VERSION: 'v3.4.13'
   go1.15-legacy:
     TYPE: 'legacy'
     CONFIG: 'go1.15'
-    GO_VERSION: '1.15.11'
-    IMAGE_VERSION: 'v1.15.11-legacy-1'
+    GO_VERSION: '1.15.12'
+    IMAGE_VERSION: 'v1.15.12-legacy-1'
     PROTOBUF_VERSION: '3.0.2'
     ETCD_VERSION: 'v3.4.13'

images/build/go-runner/Makefile

@@ -19,10 +19,10 @@ IMGNAME = go-runner
 APP_VERSION = $(shell cat VERSION)
 GO_MINOR_VERSION ?= 1.16
 OS_CODENAME ?= buster
-REVISION ?= 1
+REVISION ?= 0
 
 # Build args
-GO_VERSION ?= 1.16.3
+GO_VERSION ?= 1.16.4
 DISTROLESS_IMAGE ?= static-debian10
 
 # Configuration

images/build/go-runner/variants.yaml

@@ -1,17 +1,17 @@
 variants:
   go1.16-buster:
     CONFIG: 'go1.16-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.16.3-buster.1'
+    IMAGE_VERSION: 'v2.3.1-go1.16.4-buster.0'
     GO_MINOR_VERSION: '1.16'
     OS_CODENAME: 'buster'
-    REVISION: '1'
-    GO_VERSION: '1.16.3'
+    REVISION: '0'
+    GO_VERSION: '1.16.4'
     DISTROLESS_IMAGE: 'static-debian10'
   go1.15-buster:
     CONFIG: 'go1.15-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.15.11-buster.1'
+    IMAGE_VERSION: 'v2.3.1-go1.15.12-buster.0'
     GO_MINOR_VERSION: '1.15'
     OS_CODENAME: 'buster'
-    REVISION: '1'
-    GO_VERSION: '1.15.11'
+    REVISION: '0'
+    GO_VERSION: '1.15.12'
     DISTROLESS_IMAGE: 'static-debian10'

images/releng/ci/cloudbuild.yaml

@@ -24,8 +24,8 @@ substitutions:
   # vYYYYMMDD-hash, and can be used as a substitution
   _GIT_TAG: '12345'
   _PULL_BASE_REF: 'dev'
-  _IMAGE_VERSION: 'v0.5.1'
-  _GO_VERSION: '1.16.3'
+  _IMAGE_VERSION: 'v0.5.2'
+  _GO_VERSION: '1.16.4'
   _REGISTRY: 'fake.repository/registry-name'
 images:
   - 'gcr.io/$PROJECT_ID/releng-ci:${_GIT_TAG}'