Merge pull request #2061 from justaugustus/go116

[go1.16] Update kubernetes/kubernetes dependents to use go1.16.4

Author: k8s-ci-robot

Dockerfile-kubepkg

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.3 AS builder
+FROM golang:1.16.4 AS builder
 
 ENV GO111MODULE=on
 

Dockerfile-kubepkg-rpm

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.3 AS builder
+FROM golang:1.16.4 AS builder
 
 ENV GO111MODULE=on
 

dependencies.yaml

@@ -66,6 +66,10 @@ dependencies:
   - name: "golang"
     version: 1.16.4
     refPaths:
+    - path: Dockerfile-kubepkg
+      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+) AS builder
+    - path: Dockerfile-kubepkg-rpm
+      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+) AS builder
     - path: cmd/vulndash/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
     - path: cmd/vulndash/variants.yaml
@@ -80,6 +84,10 @@ dependencies:
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
     - path: images/releng/ci/cloudbuild.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
+    - path: images/releng/k8s-ci-builder/Makefile
+      match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
+    - path: packages/deb/Dockerfile
+      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)
 
   # Golang pre-releases are denoted as `1.y<pre-release stage>.z`
   # Example: go1.16rc1
@@ -93,10 +101,10 @@ dependencies:
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
   - name: "golang: after kubernetes/kubernetes update"
-    version: 1.16.3
+    version: 1.16.4
     refPaths:
     - path: images/releng/k8s-ci-builder/Dockerfile
-      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+) as builder
+      match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+) AS builder
     - path: images/releng/k8s-ci-builder/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
@@ -151,7 +159,7 @@ dependencies:
       match: go\d+.\d+
 
   - name: "k8s.gcr.io/build-image/kube-cross: dependents"
-    version: v1.16.3-1
+    version: v1.16.4-1
     refPaths:
     - path: images/k8s-cloud-builder/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+

images/k8s-cloud-builder/variants.yaml

@@ -1,7 +1,7 @@
 variants:
   cross1.16:
     CONFIG: 'cross1.16'
-    KUBE_CROSS_VERSION: 'v1.16.3-1'
+    KUBE_CROSS_VERSION: 'v1.16.4-1'
     SKOPEO_VERSION: 'v1.2.0'
   cross1.15:
     CONFIG: 'cross1.15'

images/releng/k8s-ci-builder/Dockerfile

@@ -17,7 +17,7 @@ ARG OLD_BAZEL_VERSION
 
 # The Golang version for the builder image should always be explicitly set to
 # the Golang version of the kubernetes/kubernetes active development branch
-FROM golang:1.16.3 as builder
+FROM golang:1.16.4 AS builder
 
 WORKDIR /go/src/k8s.io/release
 

images/releng/k8s-ci-builder/Makefile

@@ -24,7 +24,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
-GO_VERSION ?= 1.16.0
+GO_VERSION ?= 1.16.4
 BAZEL_VERSION ?= 3.4.1
 OLD_BAZEL_VERSION ?= 2.2.0
 IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)

images/releng/k8s-ci-builder/variants.yaml

@@ -1,13 +1,13 @@
 variants:
   default:
     CONFIG: default
-    GO_VERSION: '1.16.3'
+    GO_VERSION: '1.16.4'
     BAZEL_VERSION: '3.4.1'
     OLD_BAZEL_VERSION: '2.2.0'
     SKOPEO_VERSION: 'v1.2.0'
   '1.21':
     CONFIG: '1.21'
-    GO_VERSION: '1.16.3'
+    GO_VERSION: '1.16.4'
     BAZEL_VERSION: '3.4.1'
     OLD_BAZEL_VERSION: '2.2.0'
     SKOPEO_VERSION: 'v1.2.0'

packages/deb/Dockerfile

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.16.3
+FROM golang:1.16.4
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \