Merge pull request #4136 from cpanato/update-builder

Update k8s-cloud-builder and k8s-ci-builder to Go v1.25.1 and v1.24.7

Author: k8s-ci-robot

dependencies.yaml

@@ -277,13 +277,13 @@ dependencies:
   # kube-cross dependents (i.e. k8s-cloud-builder)
   # To be updated after kubernetes/kubernetes update)
   - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.34-cross1.24)"
-    version: v1.34.0-go1.24.6-bullseye.0
+    version: v1.34.0-go1.24.7-bullseye.0
     refPaths:
       - 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-]+)*))?)'"
 
   - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.33-cross1.24)"
-    version: v1.33.0-go1.24.6-bullseye.0
+    version: v1.33.0-go1.24.7-bullseye.0
     refPaths:
       - 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-]+)*))?)'"
@@ -309,16 +309,23 @@ dependencies:
 
   # Golang (current release branch: master)
   - name: "golang: after kubernetes/kubernetes update (master)"
-    version: 1.24.6
+    version: 1.25.1
     refPaths:
       - path: images/releng/k8s-ci-builder/Makefile
         match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
 
+  # Golang (previous release branch: 1.34)
+  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.34)"
+    version: 1.24.7
+    refPaths:
+      - path: images/releng/k8s-ci-builder/variants.yaml
+        match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
+
   # Golang (previous release branch: 1.33)
   - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.33)"
-    version: 1.24.6
+    version: 1.24.7
     refPaths:
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -339,27 +346,33 @@ dependencies:
 
   # k8s-ci-builder
   - name: "golang: releng tooling for k8s-ci-builder (master)"
-    version: 1.24.6
+    version: 1.25.1
     refPaths:
       - path: images/releng/k8s-ci-builder/Makefile
         match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
 
+  - name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.34)"
+    version: 1.24.7
+    refPaths:
+      - path: images/releng/k8s-ci-builder/variants.yaml
+        match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
+
   - name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.33)"
-    version: 1.24.6
+    version: 1.24.7
     refPaths:
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
 
   - name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
-    version: 1.24.6
+    version: 1.24.7
     refPaths:
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
 
   - name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.31)"
-    version: 1.24.6
+    version: 1.24.7
     refPaths:
       - path: images/releng/k8s-ci-builder/variants.yaml
         match: "GO_VERSION_TOOLING: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"

images/k8s-cloud-builder/variants.yaml

@@ -1,10 +1,13 @@
 variants:
+  v1.35-cross1.25-bullseye:
+    CONFIG: 'cross1.25'
+    KUBE_CROSS_VERSION: 'v1.35.0-go1.25.1-bullseye.0'
   v1.34-cross1.24-bullseye:
     CONFIG: 'cross1.24'
-    KUBE_CROSS_VERSION: 'v1.34.0-go1.24.6-bullseye.0'
+    KUBE_CROSS_VERSION: 'v1.34.0-go1.24.7-bullseye.0'
   v1.33-cross1.24-bullseye:
     CONFIG: 'cross1.24'
-    KUBE_CROSS_VERSION: 'v1.33.0-go1.24.6-bullseye.0'
+    KUBE_CROSS_VERSION: 'v1.33.0-go1.24.7-bullseye.0'
   v1.32-cross1.23-bullseye:
     CONFIG: 'cross1.23'
     KUBE_CROSS_VERSION: 'v1.32.0-go1.23.12-bullseye.0'

images/releng/k8s-ci-builder/Makefile

@@ -24,8 +24,8 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 TAG ?= $(shell git describe --tags --always --dirty)
 
 # Build args
-GO_VERSION ?= 1.24.6
-GO_VERSION_TOOLING ?= 1.24.6
+GO_VERSION ?= 1.25.1
+GO_VERSION_TOOLING ?= 1.25.1
 OS_CODENAME ?= bullseye
 IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
 

images/releng/k8s-ci-builder/variants.yaml

@@ -1,8 +1,8 @@
 variants:
   default:
     CONFIG: default
-    GO_VERSION: '1.24.6'
-    GO_VERSION_TOOLING: '1.24.6'
+    GO_VERSION: '1.25.1'
+    GO_VERSION_TOOLING: '1.25.1'
     OS_CODENAME: 'bullseye'
   next:
     CONFIG: next
@@ -11,21 +11,21 @@ variants:
     OS_CODENAME: 'bookworm'
   '1.34':
     CONFIG: '1.34'
-    GO_VERSION: '1.24.6'
-    GO_VERSION_TOOLING: '1.24.6'
+    GO_VERSION: '1.24.7'
+    GO_VERSION_TOOLING: '1.24.7'
     OS_CODENAME: 'bullseye'
   '1.33':
     CONFIG: '1.33'
-    GO_VERSION: '1.24.6'
-    GO_VERSION_TOOLING: '1.24.6'
+    GO_VERSION: '1.24.7'
+    GO_VERSION_TOOLING: '1.24.7'
     OS_CODENAME: 'bullseye'
   '1.32':
     CONFIG: '1.32'
     GO_VERSION: '1.23.12'
-    GO_VERSION_TOOLING: '1.24.6'
+    GO_VERSION_TOOLING: '1.24.7'
     OS_CODENAME: 'bullseye'
   '1.31':
     CONFIG: '1.31'
     GO_VERSION: '1.23.12'
-    GO_VERSION_TOOLING: '1.24.6'
+    GO_VERSION_TOOLING: '1.24.7'
     OS_CODENAME: 'bullseye'