From 901479a04628a3c66feabba29a19036f672e8ad2 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 8 Mar 2021 23:18:57 -0500 Subject: [PATCH 1/5] [go1.16] Update Golang dependency references to go1.16.1 Signed-off-by: Stephen Augustus --- dependencies.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 67486019687..a9bf642272f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -57,7 +57,7 @@ dependencies: # Golang - name: "golang" - version: 1.16 + version: 1.16.1 refPaths: - path: cmd/vulndash/Makefile match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)? @@ -112,7 +112,7 @@ 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-buster.0 + version: v2.3.1-go1.16.1-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-]+)*))?) @@ -126,7 +126,7 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross" - version: v1.16.0-1 + version: v1.16.1-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+ From 20cf6c20b6d8cc8bbaa3ec201a9341d409bab3e9 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 8 Mar 2021 23:19:55 -0500 Subject: [PATCH 2/5] [go1.16] kube-cross: Build v1.16.1-1 image Signed-off-by: Stephen Augustus --- images/build/cross/Makefile | 4 ++-- images/build/cross/variants.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/images/build/cross/Makefile b/images/build/cross/Makefile index f640128c81b..e088c04d33c 100644 --- a/images/build/cross/Makefile +++ b/images/build/cross/Makefile @@ -19,12 +19,12 @@ include $(CURDIR)/../Makefile.build-image SHELL=/bin/bash -o pipefail IMGNAME = kube-cross -IMAGE_VERSION ?= v1.16.0-1 +IMAGE_VERSION ?= v1.16.1-1 CONFIG ?= go1.16 TYPE ?= default # Build args -GO_VERSION?=1.16 +GO_VERSION?=1.16.1 PROTOBUF_VERSION?=3.7.0 ETCD_VERSION?=v3.4.13 diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index a0ccdb4e8fd..94b6131ef16 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -2,15 +2,15 @@ variants: canary: TYPE: 'default' CONFIG: 'canary' - GO_VERSION: '1.16' - IMAGE_VERSION: 'v1.16.0-canary-1' + GO_VERSION: '1.16.1' + IMAGE_VERSION: 'v1.16.1-canary-1' PROTOBUF_VERSION: '3.7.0' ETCD_VERSION: 'v3.4.13' go1.16: TYPE: 'default' CONFIG: 'go1.16' - GO_VERSION: '1.16' - IMAGE_VERSION: 'v1.16.0-1' + GO_VERSION: '1.16.1' + IMAGE_VERSION: 'v1.16.1-1' PROTOBUF_VERSION: '3.7.0' ETCD_VERSION: 'v3.4.13' go1.15: From 85babe8cba33072aeaee7f0b7502287c1f4aba36 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 8 Mar 2021 23:21:07 -0500 Subject: [PATCH 3/5] [go1.16] go-runner: Build v2.3.1-go1.16.1-buster.0 image Signed-off-by: Stephen Augustus --- images/build/go-runner/Makefile | 2 +- images/build/go-runner/variants.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/build/go-runner/Makefile b/images/build/go-runner/Makefile index eb7400ec03a..103e8f9b2ef 100644 --- a/images/build/go-runner/Makefile +++ b/images/build/go-runner/Makefile @@ -22,7 +22,7 @@ OS_CODENAME ?= buster REVISION ?= 0 # Build args -GO_VERSION ?= 1.16 +GO_VERSION ?= 1.16.1 DISTROLESS_IMAGE ?= static-debian10 # Configuration diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml index 9226b9b0b4a..f2a52f2b237 100644 --- a/images/build/go-runner/variants.yaml +++ b/images/build/go-runner/variants.yaml @@ -1,9 +1,9 @@ variants: go1.16-buster: CONFIG: 'go1.16-buster' - IMAGE_VERSION: 'v2.3.1-go1.16-buster.0' + IMAGE_VERSION: 'v2.3.1-go1.16.1-buster.0' GO_MINOR_VERSION: '1.16' OS_CODENAME: 'buster' REVISION: '0' - GO_VERSION: '1.16' + GO_VERSION: '1.16.1' DISTROLESS_IMAGE: 'static-debian10' From 99242148d7d7bcaa39461782dee44d544243ba48 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 8 Mar 2021 23:23:22 -0500 Subject: [PATCH 4/5] [go1.16] releng-ci: Build v0.5.0 image Signed-off-by: Stephen Augustus --- dependencies.yaml | 2 +- images/releng/ci/cloudbuild.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index a9bf642272f..058d018d5e8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -98,7 +98,7 @@ dependencies: # Golang images - name: "gcr.io/k8s-staging-releng/releng-ci" - version: v0.4.0 + version: v0.5.0 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-]+)*))?) diff --git a/images/releng/ci/cloudbuild.yaml b/images/releng/ci/cloudbuild.yaml index 882ef2416e4..5a6e166629a 100644 --- a/images/releng/ci/cloudbuild.yaml +++ b/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.4.0' - _GO_VERSION: '1.16' + _IMAGE_VERSION: 'v0.5.0' + _GO_VERSION: '1.16.1' images: - 'gcr.io/$PROJECT_ID/releng-ci:${_GIT_TAG}' - 'gcr.io/$PROJECT_ID/releng-ci:${_IMAGE_VERSION}' From 0b400b982e817a3275e51de1a3239cf6f68f0597 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Mon, 8 Mar 2021 23:26:03 -0500 Subject: [PATCH 5/5] [go1.16] vulndash: Build v0.4.3-6 image Signed-off-by: Stephen Augustus --- cmd/vulndash/Makefile | 4 ++-- cmd/vulndash/variants.yaml | 4 ++-- dependencies.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cmd/vulndash/Makefile b/cmd/vulndash/Makefile index 1f566496b40..d38a4c148c4 100644 --- a/cmd/vulndash/Makefile +++ b/cmd/vulndash/Makefile @@ -20,7 +20,7 @@ SHELL=/bin/bash -o pipefail REGISTRY ?= gcr.io/k8s-staging-artifact-promoter IMGNAME = vulndash -IMAGE_VERSION ?= v0.4.3-5 +IMAGE_VERSION ?= v0.4.3-6 CONFIG ?= buster IMAGE = $(REGISTRY)/$(IMGNAME) @@ -28,7 +28,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) TAG ?= $(shell git describe --tags --always --dirty) # Build args -GO_VERSION ?= 1.16 +GO_VERSION ?= 1.16.1 DISTROLESS_IMAGE ?= static-debian10 PLATFORMS ?= linux/amd64 diff --git a/cmd/vulndash/variants.yaml b/cmd/vulndash/variants.yaml index c51bf860b00..433f35c3727 100644 --- a/cmd/vulndash/variants.yaml +++ b/cmd/vulndash/variants.yaml @@ -1,5 +1,5 @@ variants: default: - IMAGE_VERSION: 'v0.4.3-5' - GO_VERSION: '1.16' + IMAGE_VERSION: 'v0.4.3-6' + GO_VERSION: '1.16.1' DISTROLESS_IMAGE: 'static-debian10' diff --git a/dependencies.yaml b/dependencies.yaml index 058d018d5e8..c9db25b55c7 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -104,7 +104,7 @@ 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-]+)*))?) - name: "k8s.gcr.io/artifact-promoter/vulndash" - version: v0.4.3-5 + version: v0.4.3-6 refPaths: - path: cmd/vulndash/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]+)