From e009654cd048032c99e048902fdb3f19104a1669 Mon Sep 17 00:00:00 2001
From: cpanato <ctadeu@gmail.com>
Date: Wed, 5 Feb 2025 15:16:59 +0100
Subject: [PATCH] Update k8s-cloud-builder and k8s-ci-builder to Go 1.23.5

Signed-off-by: cpanato <ctadeu@gmail.com>
---
 dependencies.yaml                          | 14 +++-----------
 images/k8s-cloud-builder/variants.yaml     |  2 +-
 images/releng/k8s-ci-builder/Makefile      |  4 ++--
 images/releng/k8s-ci-builder/variants.yaml |  6 +++---
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 2a3d6b59bf5..2466671b641 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -351,7 +351,7 @@ 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.33-cross1.23)"
-    version: v1.33.0-go1.23.4-bullseye.0
+    version: v1.33.0-go1.23.5-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-]+)*))?)'"
@@ -396,7 +396,7 @@ dependencies:
 
   # Golang (current release branch: master)
   - name: "golang: after kubernetes/kubernetes update (master)"
-    version: 1.23.4
+    version: 1.23.5
     refPaths:
     - path: images/releng/k8s-ci-builder/Makefile
       match: GO_VERSION\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -433,7 +433,7 @@ dependencies:
 
   # k8s-ci-builder
   - name: "golang: releng tooling for k8s-ci-builder (master)"
-    version: 1.23.4
+    version: 1.23.5
     refPaths:
     - path: images/releng/k8s-ci-builder/Makefile
       match: GO_VERSION_TOOLING\ \?=\ \d+.\d+(alpha|beta|rc)?\.?(\d+)?
@@ -443,32 +443,24 @@ dependencies:
   - name: "golang: releng tooling for k8s-ci-builder (previous release branches: 1.32)"
     version: 1.23.4
     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.31)"
     version: 1.23.4
     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.30)"
     version: 1.23.4
     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.29)"
     version: 1.23.4
     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+)?'"
 
diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml
index f669e4603f3..eb7debe13da 100644
--- a/images/k8s-cloud-builder/variants.yaml
+++ b/images/k8s-cloud-builder/variants.yaml
@@ -1,7 +1,7 @@
 variants:
   v1.33-cross1.23-bullseye:
     CONFIG: 'cross1.23'
-    KUBE_CROSS_VERSION: 'v1.33.0-go1.23.4-bullseye.0'
+    KUBE_CROSS_VERSION: 'v1.33.0-go1.23.5-bullseye.0'
   v1.32-cross1.23-bullseye:
     CONFIG: 'cross1.23'
     KUBE_CROSS_VERSION: 'v1.32.0-go1.23.4-bullseye.0'
diff --git a/images/releng/k8s-ci-builder/Makefile b/images/releng/k8s-ci-builder/Makefile
index 106b53139c0..57e22b22790 100644
--- a/images/releng/k8s-ci-builder/Makefile
+++ b/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.23.4
-GO_VERSION_TOOLING ?= 1.23.4
+GO_VERSION ?= 1.23.5
+GO_VERSION_TOOLING ?= 1.23.5
 OS_CODENAME ?= bullseye
 IMAGE_ARG ?= $(IMAGE):$(TAG)-$(CONFIG)
 
diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml
index 722711db82d..fd6f837fbd0 100644
--- a/images/releng/k8s-ci-builder/variants.yaml
+++ b/images/releng/k8s-ci-builder/variants.yaml
@@ -2,7 +2,7 @@ variants:
   default:
     CONFIG: default
     GO_VERSION: '1.22.10'
-    GO_VERSION_TOOLING: '1.23.4'
+    GO_VERSION_TOOLING: '1.23.5'
     OS_CODENAME: 'bullseye'
   next:
     CONFIG: next
@@ -11,8 +11,8 @@ variants:
     OS_CODENAME: 'bookworm'
   '1.33':
     CONFIG: '1.33'
-    GO_VERSION: '1.23.4'
-    GO_VERSION_TOOLING: '1.23.4'
+    GO_VERSION: '1.23.5'
+    GO_VERSION_TOOLING: '1.23.5'
     OS_CODENAME: 'bullseye'
   '1.32':
     CONFIG: '1.32'