Merge pull request #2239 from cpanato/GH-2238-images

[go] Build go1.17.1 and go1.16.8 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-buster AS builder
+FROM golang:1.17.1-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-buster AS builder
+FROM golang:1.17.1-buster AS builder
 
 ENV GO111MODULE=on
 

cmd/kpromo/Makefile

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

cmd/kpromo/variants.yaml

@@ -1,6 +1,6 @@
 variants:
   default:
     IMAGE_VERSION: 'v0.1.0-1'
-    GO_VERSION: '1.17'
+    GO_VERSION: '1.17.1'
     OS_CODENAME: 'buster'
     DISTROLESS_IMAGE: 'static-debian10'

cmd/vulndash/Makefile

@@ -27,7 +27,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
-GO_VERSION ?= 1.17
+GO_VERSION ?= 1.17.1
 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'
+    GO_VERSION: '1.17.1'
     OS_CODENAME: 'buster'
     DISTROLESS_IMAGE: 'static-debian10'

dependencies.yaml

@@ -60,7 +60,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.17
+    version: 1.17.1
     refPaths:
     - path: Dockerfile-kubepkg
       match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
@@ -178,7 +178,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-buster.0
+    version: v2.3.1-go1.17.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-]+)*))?)
@@ -192,7 +192,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross"
-    version: v1.23.0-go1.17-buster.0
+    version: v1.23.0-go1.17.1-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-]+)*))?)'"
@@ -238,7 +238,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/go-runner (next candidate)"
-    version: v2.3.1-go1.17-buster.0
+    version: v2.3.1-go1.17.1-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-]+)*))?)'"
@@ -250,7 +250,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross (next candidate)"
-    version: v1.23.0-go1.17-buster.0
+    version: v1.23.0-go1.17.1-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-]+)*))?)'"
@@ -267,7 +267,24 @@ dependencies:
     - path: images/k8s-cloud-builder/variants.yaml
       match: "KUBE_CROSS_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
 
-  # Golang (for previous release branches)
+  # Golang (for previous release branches 1.21/1.22)
+  - name: "golang (for previous release branches)"
+    version: 1.16.8
+    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+)?
+
+  - name: "golang: after kubernetes/kubernetes update (for previous release branches 1.21/1.22)"
+    version: 1.16.7
+    refPaths:
+    - path: images/releng/k8s-ci-builder/variants.yaml
+      match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
+
+  # Golang (for previous release branches 1.19/1.20)
   - name: "golang (for previous release branches)"
     version: 1.15.15
     refPaths:
@@ -278,7 +295,7 @@ dependencies:
     - path: images/releng/ci/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  - name: "golang: after kubernetes/kubernetes update (for previous release branches)"
+  - name: "golang: after kubernetes/kubernetes update (for previous release branches 1.19/1.20)"
     version: 1.15.15
     refPaths:
     - path: images/releng/k8s-ci-builder/variants.yaml
@@ -291,7 +308,13 @@ dependencies:
     - path: images/releng/ci/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "k8s.gcr.io/build-image/go-runner (for previous release branches)"
+  - name: "k8s.gcr.io/build-image/go-runner (for previous release branches 1.21/1.22)"
+    version: v2.3.1-go1.16.8-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 (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
@@ -303,19 +326,31 @@ dependencies:
     - path: images/build/go-runner/variants.yaml
       match: REVISION:\ '\d+'
 
-  - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches)"
+  - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches 1.21/1.22)"
+    version: v1.22.0-go1.16.8-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-]+)*))?)'"
+
+  - name: "k8s.gcr.io/build-image/kube-cross: config variant (for previous release branches 1.21/1.22)"
+    version: go1.16-buster
+    refPaths:
+    - path: images/build/cross/variants.yaml
+      match: "CONFIG: 'go\\d+.\\d+-(bullseye|buster)'"
+
+  - name: "k8s.gcr.io/build-image/kube-cross (for previous release branches 1.19/1.20)"
     version: v1.20.0-go1.15.15-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-]+)*))?)'"
 
-  - name: "k8s.gcr.io/build-image/kube-cross: config variant (for previous release branches)"
+  - name: "k8s.gcr.io/build-image/kube-cross: config variant (for previous release branches 1.19/1.20)"
     version: go1.15-buster
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "CONFIG: 'go\\d+.\\d+-(bullseye|buster)'"
 
-  - name: "k8s.gcr.io/build-image/kube-cross: dependents (for previous release branches)"
+  - name: "k8s.gcr.io/build-image/kube-cross: dependents (for previous release branches 1.19/1.20)"
     version: v1.15.15-legacy-1
     refPaths:
     - path: images/k8s-cloud-builder/variants.yaml

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
+GO_VERSION ?= 1.17.1
 GO_MAJOR_VERSION ?= 1.17
 OS_CODENAME ?= buster
 REVISION ?= 0

images/build/cross/variants.yaml

@@ -2,19 +2,19 @@ variants:
   go1.17-buster:
     CONFIG: 'go1.17-buster'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.23.0-go1.17-buster.0'
+    IMAGE_VERSION: 'v1.23.0-go1.17.1-buster.0'
     KUBERNETES_VERSION: 'v1.23.0'
-    GO_VERSION: '1.17'
+    GO_VERSION: '1.17.1'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'buster'
     REVISION: '0'
     PROTOBUF_VERSION: '3.7.0'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.22.0-go1.16.7-buster.0'
+    IMAGE_VERSION: 'v1.22.0-go1.16.8-buster.0'
     KUBERNETES_VERSION: 'v1.22.0'
-    GO_VERSION: '1.16.7'
+    GO_VERSION: '1.16.8'
     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
+GO_VERSION ?= 1.17.1
 OS_CODENAME ?= buster
 DISTROLESS_IMAGE ?= static-debian10
 

images/build/go-runner/variants.yaml

@@ -1,19 +1,19 @@
 variants:
   go1.17-buster:
     CONFIG: 'go1.17-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.17-buster.0'
+    IMAGE_VERSION: 'v2.3.1-go1.17.1-buster.0'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'buster'
     REVISION: '0'
-    GO_VERSION: '1.17'
+    GO_VERSION: '1.17.1'
     DISTROLESS_IMAGE: 'static-debian10'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
-    IMAGE_VERSION: 'v2.3.1-go1.16.7-buster.0'
+    IMAGE_VERSION: 'v2.3.1-go1.16.8-buster.0'
     GO_MAJOR_VERSION: '1.16'
     OS_CODENAME: 'buster'
     REVISION: '0'
-    GO_VERSION: '1.16.7'
+    GO_VERSION: '1.16.8'
     DISTROLESS_IMAGE: 'static-debian10'
   go1.15-buster:
     CONFIG: 'go1.15-buster'

images/releng/ci/variants.yaml

@@ -1,12 +1,12 @@
 variants:
   go1.17-buster:
     CONFIG: 'go1.17-buster'
-    GO_VERSION: '1.17'
+    GO_VERSION: '1.17.1'
     OS_CODENAME: 'buster'
     REVISION: '0'
   go1.16-buster:
     CONFIG: 'go1.16-buster'
-    GO_VERSION: '1.16.7'
+    GO_VERSION: '1.16.8'
     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-buster
+FROM golang:1.17.1-buster
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \