Merge pull request #3779 from haitch/haitao/golang_patch_oct2024

build kube-cross, go-runner, releng-ci with golang 1.22.8, 1.23.2

dependencies.yaml

@@ -22,7 +22,7 @@ dependencies:
 
   # Golang
   - name: "golang"
-    version: 1.22.7
+    version: 1.22.8
     refPaths:
     - path: images/build/cross/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -117,7 +117,7 @@ dependencies:
 
   # go-runner
   - name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
-    version: v2.3.1-go1.23.1-bookworm.0
+    version: v2.3.1-go1.23.2-bookworm.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-]+)*))?)
@@ -131,7 +131,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)"
-    version: v2.3.1-go1.22.7-bookworm.0
+    version: v2.3.1-go1.22.8-bookworm.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-]+)*))?)
@@ -146,7 +146,7 @@ dependencies:
 
   # kube-cross
   - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
-    version: v1.31.0-go1.23.1-bullseye.0
+    version: v1.31.0-go1.23.2-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-]+)*))?)'"
@@ -166,7 +166,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
-    version: v1.31.0-go1.22.7-bullseye.0
+    version: v1.31.0-go1.22.8-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-]+)*))?)'"
@@ -187,7 +187,7 @@ dependencies:
 
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
-    version: v1.30.0-go1.22.7-bullseye.0
+    version: v1.30.0-go1.22.8-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-]+)*))?)'"
@@ -207,7 +207,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)"
-    version: v1.29.0-go1.22.7-bullseye.0
+    version: v1.29.0-go1.22.8-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-]+)*))?)'"
@@ -227,7 +227,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.22)"
-    version: v1.28.0-go1.22.7-bullseye.0
+    version: v1.28.0-go1.22.8-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-]+)*))?)'"
@@ -291,7 +291,7 @@ dependencies:
 
   # Golang (next candidate)
   - name: "golang (next candidate)"
-    version: 1.23.1
+    version: 1.23.2
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -318,7 +318,7 @@ dependencies:
 
   # Golang (previous release branches: 1.30)
   - name: "golang (previous release branches: 1.30)"
-    version: 1.22.7
+    version: 1.22.8
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -335,7 +335,7 @@ dependencies:
 
   # Golang (previous release branches: 1.29)
   - name: "golang (previous release branches: 1.29)"
-    version: 1.22.7
+    version: 1.22.8
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -352,7 +352,7 @@ dependencies:
 
   # Golang (previous release branches: 1.28)
   - name: "golang (previous release branches: 1.28)"
-    version: 1.22.7
+    version: 1.22.8
     refPaths:
     - path: images/build/cross/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

images/build/cross/Makefile

@@ -28,7 +28,7 @@ IMGNAME = kube-cross
 # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
 # - v1.100-go1.17-bullseye.0 does not
 KUBERNETES_VERSION ?= v1.31.0
-GO_VERSION ?= 1.22.7
+GO_VERSION ?= 1.22.8
 GO_MAJOR_VERSION ?= 1.22
 OS_CODENAME ?= bullseye
 REVISION ?= 0
@@ -53,7 +53,7 @@ export DOCKER_CLI_EXPERIMENTAL=enabled
 # TODO: Support multi-arch kube-cross images for linux/arm
 #       Currently some of the components references in the Dockerfile are
 #       not supported in specific architectures
-PLATFORMS ?= linux/amd64 linux/arm64 linux/ppc64le linux/s390x #linux/arm
+PLATFORMS ?= linux/amd64 linux/arm64 #linux/arm
 
 # for legacy images only build linux/amd64
 ifeq ($(TYPE), legacy)

images/build/cross/variants.yaml

@@ -2,54 +2,54 @@ variants:
   v1.32-go1.23-bullseye:
     CONFIG: 'go1.23-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.32.0-go1.23.1-bullseye.0'
+    IMAGE_VERSION: 'v1.32.0-go1.23.2-bullseye.0'
     KUBERNETES_VERSION: 'v1.32.0'
-    GO_VERSION: '1.23.1'
+    GO_VERSION: '1.23.2'
     GO_MAJOR_VERSION: '1.23'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.31-go1.23-bullseye:
     CONFIG: 'go1.23-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.31.0-go1.23.1-bullseye.0'
+    IMAGE_VERSION: 'v1.31.0-go1.23.2-bullseye.0'
     KUBERNETES_VERSION: 'v1.31.0'
-    GO_VERSION: '1.23.1'
+    GO_VERSION: '1.23.2'
     GO_MAJOR_VERSION: '1.23'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.31-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.31.0-go1.22.7-bullseye.0'
+    IMAGE_VERSION: 'v1.31.0-go1.22.8-bullseye.0'
     KUBERNETES_VERSION: 'v1.31.0'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.30-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.30.0-go1.22.7-bullseye.0'
+    IMAGE_VERSION: 'v1.30.0-go1.22.8-bullseye.0'
     KUBERNETES_VERSION: 'v1.30.0'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.29-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.29.0-go1.22.7-bullseye.0'
+    IMAGE_VERSION: 'v1.29.0-go1.22.8-bullseye.0'
     KUBERNETES_VERSION: 'v1.29.0'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
   v1.28-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.28.0-go1.22.7-bullseye.0'
+    IMAGE_VERSION: 'v1.28.0-go1.22.8-bullseye.0'
     KUBERNETES_VERSION: 'v1.28.0'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bullseye'
     REVISION: '0'

images/build/go-runner/Makefile

@@ -19,7 +19,7 @@ IMGNAME = go-runner
 APP_VERSION = $(shell cat VERSION)
 GO_MAJOR_VERSION ?= 1.22
 REVISION ?= 0
-GO_VERSION ?= 1.22.7
+GO_VERSION ?= 1.22.8
 OS_CODENAME ?= bookworm
 
 # Build args

images/build/go-runner/variants.yaml

@@ -1,17 +1,17 @@
 variants:
   go1.23-bookworm:
     CONFIG: 'go1.23-bookworm'
-    IMAGE_VERSION: 'v2.3.1-go1.23.1-bookworm.0'
+    IMAGE_VERSION: 'v2.3.1-go1.23.2-bookworm.0'
     GO_MAJOR_VERSION: '1.23'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-    GO_VERSION: '1.23.1'
+    GO_VERSION: '1.23.2'
     DISTROLESS_IMAGE: 'static-debian12'
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
-    IMAGE_VERSION: 'v2.3.1-go1.22.7-bookworm.0'
+    IMAGE_VERSION: 'v2.3.1-go1.22.8-bookworm.0'
     GO_MAJOR_VERSION: '1.22'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     DISTROLESS_IMAGE: 'static-debian12'

images/releng/ci/variants.yaml

@@ -1,12 +1,12 @@
 variants:
   go1.23-bookworm:
     CONFIG: 'go1.23-bookworm'
-    GO_VERSION: '1.23.1'
+    GO_VERSION: '1.23.2'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
-    GO_VERSION: '1.22.7'
+    GO_VERSION: '1.22.8'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
   go1.21-bookworm: