Merge pull request kubernetes#2621 from cpanato/go118117

[GO] build Go 1.18.4 and 1.17.12 images

Dockerfile-kubepkg

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

dependencies.yaml

@@ -53,7 +53,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.18.3
+    version: 1.18.4
     refPaths:
     - path: Dockerfile-kubepkg
       match: FROM golang:\d+.\d+(alpha|beta|rc)?\.?(\d+)-(bullseye|buster) AS builder
@@ -127,7 +127,7 @@ dependencies:
   # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
   # - v1.100-go1.17-bullseye.0 does not
   - name: "Kubernetes version (stable.0)"
-    version: v1.23.0
+    version: v1.24.0
     refPaths:
     - path: images/build/cross/Makefile
       match: KUBERNETES_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
@@ -147,7 +147,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/go-runner"
-    version: v2.3.1-go1.17.11-bullseye.0
+    version: v2.3.1-go1.17.12-bullseye.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-]+)*))?)
@@ -161,7 +161,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross"
-    version: v1.25.0-go1.18.3-bullseye.0
+    version: v1.25.0-go1.18.4-bullseye.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:
 
   # Golang (previous release branches: 1.24)
   - name: "golang (previous release branches: 1.24)"
-    version: 1.18.3
+    version: 1.18.4
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -255,7 +255,7 @@ dependencies:
 
   # Golang (previous release branches: 1.23)
   - name: "golang (previous release branches: 1.23)"
-    version: 1.17.11
+    version: 1.17.12
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -295,13 +295,13 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/go-runner (previous release branches: 1.24)"
-    version: v2.3.1-go1.18.3-bullseye.0
+    version: v2.3.1-go1.18.4-bullseye.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 (previous release branches: 1.23)"
-    version: v2.3.1-go1.17.11-bullseye.0
+    version: v2.3.1-go1.17.12-bullseye.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-]+)*))?)
@@ -319,13 +319,13 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "k8s.gcr.io/build-image/kube-cross (previous release branches: 1.24)"
-    version: v1.24.0-go1.18.3-bullseye.0
+    version: v1.24.0-go1.18.4-bullseye.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 (previous release branches: 1.23)"
-    version: v1.23.0-go1.17.11-bullseye.0
+    version: v1.23.0-go1.17.12-bullseye.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-]+)*))?)'"
@@ -336,13 +336,7 @@ dependencies:
     - 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 (previous release branches: 1.21)"
-    version: v1.21.0-go1.16.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 (previous release branches: 1.22, 1.21)"
+  - name: "k8s.gcr.io/build-image/kube-cross: config variant (previous release branches: 1.22)"
     version: go1.16-buster
     refPaths:
     - path: images/build/cross/variants.yaml

images/build/cross/Makefile

@@ -27,8 +27,8 @@ IMGNAME = kube-cross
 # Example:
 # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
 # - v1.100-go1.17-bullseye.0 does not
-KUBERNETES_VERSION ?= v1.23.0
-GO_VERSION ?= 1.18.3
+KUBERNETES_VERSION ?= v1.24.0
+GO_VERSION ?= 1.18.4
 GO_MAJOR_VERSION ?= 1.18
 OS_CODENAME ?= bullseye
 REVISION ?= 0

images/build/cross/variants.yaml

@@ -12,29 +12,29 @@ variants:
   v1.25-go1.18-bullseye:
     CONFIG: 'go1.18-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.25.0-go1.18.3-bullseye.0'
+    IMAGE_VERSION: 'v1.25.0-go1.18.4-bullseye.0'
     KUBERNETES_VERSION: 'v1.25.0'
-    GO_VERSION: '1.18.3'
+    GO_VERSION: '1.18.4'
     GO_MAJOR_VERSION: '1.18'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
   v1.24-go1.18-bullseye:
     CONFIG: 'go1.18-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.24.0-go1.18.3-bullseye.0'
+    IMAGE_VERSION: 'v1.24.0-go1.18.4-bullseye.0'
     KUBERNETES_VERSION: 'v1.24.0'
-    GO_VERSION: '1.18.3'
+    GO_VERSION: '1.18.4'
     GO_MAJOR_VERSION: '1.18'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
   v1.23-go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.23.0-go1.17.11-bullseye.0'
+    IMAGE_VERSION: 'v1.23.0-go1.17.12-bullseye.0'
     KUBERNETES_VERSION: 'v1.23.0'
-    GO_VERSION: '1.17.11'
+    GO_VERSION: '1.17.12'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
@@ -49,13 +49,3 @@ variants:
     OS_CODENAME: 'buster'
     REVISION: '0'
     PROTOBUF_VERSION: '3.19.4'
-  v1.21-go1.16-buster:
-    CONFIG: 'go1.16-buster'
-    TYPE: 'default'
-    IMAGE_VERSION: 'v1.21.0-go1.16.15-buster.0'
-    KUBERNETES_VERSION: 'v1.21.0'
-    GO_VERSION: '1.16.15'
-    GO_MAJOR_VERSION: '1.16'
-    OS_CODENAME: 'buster'
-    REVISION: '0'
-    PROTOBUF_VERSION: '3.19.4'

images/build/go-runner/Makefile

@@ -21,7 +21,7 @@ GO_MAJOR_VERSION ?= 1.18
 REVISION ?= 0
 
 # Build args
-GO_VERSION ?= 1.18.3
+GO_VERSION ?= 1.18.4
 OS_CODENAME ?= bullseye
 DISTROLESS_IMAGE ?= static-debian11
 

images/build/go-runner/variants.yaml

@@ -9,19 +9,19 @@ variants:
     DISTROLESS_IMAGE: 'static-debian11'
   go1.18-bullseye:
     CONFIG: 'go1.18-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.18.3-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.18.4-bullseye.0'
     GO_MAJOR_VERSION: '1.18'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.18.3'
+    GO_VERSION: '1.18.4'
     DISTROLESS_IMAGE: 'static-debian11'
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
-    IMAGE_VERSION: 'v2.3.1-go1.17.11-bullseye.0'
+    IMAGE_VERSION: 'v2.3.1-go1.17.12-bullseye.0'
     GO_MAJOR_VERSION: '1.17'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-    GO_VERSION: '1.17.11'
+    GO_VERSION: '1.17.12'
     DISTROLESS_IMAGE: 'static-debian11'
   go1.16-buster:
     CONFIG: 'go1.16-buster'

images/releng/ci/variants.yaml

@@ -6,12 +6,12 @@ variants:
     REVISION: '0'
   go1.18-bullseye:
     CONFIG: 'go1.18-bullseye'
-    GO_VERSION: '1.18.3'
+    GO_VERSION: '1.18.4'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   go1.17-bullseye:
     CONFIG: 'go1.17-bullseye'
-    GO_VERSION: '1.17.11'
+    GO_VERSION: '1.17.12'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   go1.16-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.18.3-bullseye
+FROM golang:1.18.4-bullseye
 
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -y \