Merge pull request #2305 from cpanato/goupdates

[go] Build go1.17.3 and go1.16.10 images

Dockerfile-kubepkg

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.17.2-buster AS builder
+FROM golang:1.17.3-buster 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.17.2-buster AS builder
+FROM golang:1.17.3-buster AS builder
 
 ENV GO111MODULE=on
 

cmd/vulndash/Makefile

@@ -27,7 +27,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
-GO_VERSION ?= 1.17.2
+GO_VERSION ?= 1.17.3
 OS_CODENAME ?= buster
 DISTROLESS_IMAGE ?= static-debian10
 

cmd/vulndash/variants.yaml

@@ -1,6 +1,6 @@
 variants:
   default:
     IMAGE_VERSION: 'v0.4.3-8'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     OS_CODENAME: 'buster'
     DISTROLESS_IMAGE: 'static-debian10'

dependencies.yaml

@@ -60,7 +60,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.17.2
+    version: 1.17.3
     refPaths:
     - path: Dockerfile-kubepkg
       match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
@@ -166,7 +166,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.17.2-buster.0
+    version: v2.3.1-go1.17.3-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-]+)*))?)
@@ -180,7 +180,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross"
-    version: v1.23.0-go1.17.2-buster.0
+    version: v1.23.0-go1.17.3-buster.0
     refPaths:
     - path: images/build/cross/variants.yaml
       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-]+)*))?)'"
@@ -232,7 +232,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/go-runner (next candidate)"
-    version: v2.3.1-go1.17.2-buster.0
+    version: v2.3.1-go1.17.3-buster.0
     refPaths:
     - path: images/build/go-runner/variants.yaml
       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-]+)*))?)'"
@@ -244,7 +244,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
-    version: v1.23.0-go1.17.2-buster.0
+    version: v1.23.0-go1.17.3-buster.0
     refPaths:
     - path: images/build/cross/variants.yaml
       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-]+)*))?)'"
@@ -263,7 +263,7 @@ dependencies:
 
   # Golang (for previous release branches 1.21/1.22)
   - name: "golang (for previous release branches)"
-    version: 1.16.9
+    version: 1.16.10
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -301,7 +301,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/go-runner (for previous release branches 1.21/1.22)"
-    version: v2.3.1-go1.16.9-buster.0
+    version: v2.3.1-go1.16.10-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-]+)*))?)
@@ -317,7 +317,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches 1.21/1.22)"
-    version: v1.22.0-go1.16.9-buster.0
+    version: v1.22.0-go1.16.10-buster.0
     refPaths:
     - path: images/build/cross/variants.yaml
       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-]+)*))?)'"

images/build/cross/Makefile

@@ -28,7 +28,7 @@ IMGNAME = kube-cross
 # - v1.100.0-go1.17-buster.0 satisfies SemVer regex, while:
 # - v1.100-go1.17-buster.0 does not
 KUBERNETES_VERSION ?= v1.22.0
-GO_VERSION ?= 1.17.2
+GO_VERSION ?= 1.17.3
 GO_MAJOR_VERSION ?= 1.17
 OS_CODENAME ?= buster
 REVISION ?= 0

images/build/cross/variants.yaml

@@ -2,39 +2,39 @@ variants:
   v1.23-go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.23.0-go1.17.2-bullseye.0'
+    IMAGE_VERSION: 'v1.23.0-go1.17.3-bullseye.0'
     KUBERNETES_VERSION: 'v1.23.0'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.7.0'
   v1.23-go1.17-buster:
     CONFIG: 'go1.17-buster'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.23.0-go1.17.2-buster.0'
+    IMAGE_VERSION: 'v1.23.0-go1.17.3-buster.0'
     KUBERNETES_VERSION: 'v1.23.0'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'buster'
     REVISION: '0'
     PROTOBUF_VERSION: '3.7.0'
   v1.22-go1.16-buster:
     CONFIG: 'go1.16-buster'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.22.0-go1.16.9-buster.0'
+    IMAGE_VERSION: 'v1.22.0-go1.16.10-buster.0'
     KUBERNETES_VERSION: 'v1.22.0'
-    GO_VERSION: '1.16.9'
+    GO_VERSION: '1.16.10'
     GO_MAJOR_VERSION: '1.16'
     OS_CODENAME: 'buster'
     REVISION: '0'
     PROTOBUF_VERSION: '3.7.0'
   v1.21-go1.16-buster:
     CONFIG: 'go1.16-buster'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.21.0-go1.16.9-buster.0'
+    IMAGE_VERSION: 'v1.21.0-go1.16.10-buster.0'
     KUBERNETES_VERSION: 'v1.21.0'
-    GO_VERSION: '1.16.9'
+    GO_VERSION: '1.16.10'
     GO_MAJOR_VERSION: '1.16'
     OS_CODENAME: 'buster'
     REVISION: '0'

images/build/go-runner/Makefile

@@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.17
 REVISION ?= 0
 
 # Build args
-GO_VERSION ?= 1.17.2
+GO_VERSION ?= 1.17.3
 OS_CODENAME ?= buster
 DISTROLESS_IMAGE ?= static-debian10
 

images/build/go-runner/variants.yaml

@@ -1,25 +1,25 @@
 variants:
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.17.2-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.17.3-bullseye.0'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     DISTROLESS_IMAGE: 'static-debian11'
   go1.17-buster:
     CONFIG: 'go1.17-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.17.2-buster.0'
+    IMAGE_VERSION: 'v2.3.1-go1.17.3-buster.0'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'buster'
     REVISION: '0'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     DISTROLESS_IMAGE: 'static-debian10'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.16.9-buster.0'
+    IMAGE_VERSION: 'v2.3.1-go1.16.10-buster.0'
     GO_MAJOR_VERSION: '1.16'
     OS_CODENAME: 'buster'
     REVISION: '0'
-    GO_VERSION: '1.16.9'
+    GO_VERSION: '1.16.10'
     DISTROLESS_IMAGE: 'static-debian10'

images/releng/ci/variants.yaml

@@ -1,17 +1,17 @@
 variants:
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   go1.17-buster:
     CONFIG: 'go1.17-buster'
-    GO_VERSION: '1.17.2'
+    GO_VERSION: '1.17.3'
     OS_CODENAME: 'buster'
     REVISION: '0'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
-    GO_VERSION: '1.16.9'
+    GO_VERSION: '1.16.10'
     OS_CODENAME: 'buster'
     REVISION: '0'
   go1.15-buster:

packages/deb/Dockerfile

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