From 55ab676d83442e25b77ad248994d2f2a24ae68cd Mon Sep 17 00:00:00 2001
From: cpanato <ctadeu@gmail.com>
Date: Mon, 30 Dec 2024 10:27:08 +0100
Subject: [PATCH] golang: Build 1.24rc1 images

Signed-off-by: cpanato <ctadeu@gmail.com>
---
 dependencies.yaml                          | 44 +++++++++++++++++++---
 images/build/cross/variants.yaml           |  9 +++++
 images/build/go-runner/variants.yaml       |  8 ++++
 images/releng/ci/variants.yaml             |  5 +++
 images/releng/k8s-ci-builder/variants.yaml |  2 +-
 5 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index 6b11b627ce9..950f58a4e46 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -143,6 +143,20 @@ dependencies:
     refPaths:
     - path: images/build/go-runner/VERSION
 
+  - name: "registry.k8s.io/build-image/go-runner (go1.24-bookworm)"
+    version: v2.4.0-go1.24rc1-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-]+)*))?)
+
+  - name: "registry.k8s.io/build-image/go-runner: image revision (go1.24-bookworm)"
+    version: 0
+    refPaths:
+    - path: images/build/go-runner/Makefile
+      match: REVISION \?= \d+
+    - path: images/build/go-runner/variants.yaml
+      match: REVISION:\ '\d+'
+
   # go-runner (latest Golang)
   # To be updated before kubernetes/kubernetes update
   - name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
@@ -176,11 +190,31 @@ dependencies:
       match: REVISION:\ '\d+'
 
   # kube-cross (next candidate)
-  # - name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
-  #   version: go1.24rc1-bullseye
-  #   refPaths:
-  #   - path: images/build/cross/variants.yaml
-  #     match: "CONFIG: 'go\\d+.\\d+-bullseye'"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
+    version: go1.24-bullseye
+    refPaths:
+    - path: images/build/cross/variants.yaml
+      match: "CONFIG: 'go\\d+.\\d+-bullseye'"
+
+  - name: "registry.k8s.io/build-image/kube-cross (v1.33-go1.24)"
+    version: v1.33.0-go1.24rc1-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: "registry.k8s.io/build-image/kube-cross: config variant (v1.33-go1.24)"
+    version: go1.24-bullseye
+    refPaths:
+    - path: images/build/cross/variants.yaml
+      match: "CONFIG: 'go\\d+.\\d+-bullseye'"
+
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.33-go1.24)"
+    version: 0
+    refPaths:
+    - path: images/build/cross/Makefile
+      match: REVISION \?= \d+
+    - path: images/build/cross/variants.yaml
+      match: REVISION:\ '\d+'
 
   # kube-cross (Kubernetes v1.33)
   # To be updated before kubernetes/kubernetes update
diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
index f597fd0dd03..2160a5eee87 100644
--- a/images/build/cross/variants.yaml
+++ b/images/build/cross/variants.yaml
@@ -1,4 +1,13 @@
 variants:
+  v1.33-go1.24-bullseye:
+    CONFIG: 'go1.24-bullseye'
+    TYPE: 'default'
+    IMAGE_VERSION: 'v1.33.0-go1.24rc1-bullseye.0'
+    KUBERNETES_VERSION: 'v1.33.0'
+    GO_VERSION: '1.24rc1'
+    GO_MAJOR_VERSION: '1.24'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
   v1.33-go1.23-bullseye:
     CONFIG: 'go1.23-bullseye'
     TYPE: 'default'
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
index d6a38b72523..c3e8ecde5c8 100644
--- a/images/build/go-runner/variants.yaml
+++ b/images/build/go-runner/variants.yaml
@@ -1,4 +1,12 @@
 variants:
+  go1.24-bookworm:
+    CONFIG: 'go1.24-bookworm'
+    IMAGE_VERSION: 'v2.4.0-go1.24rc1-bookworm.0'
+    GO_MAJOR_VERSION: '1.24'
+    OS_CODENAME: 'bookworm'
+    REVISION: '0'
+    GO_VERSION: '1.24rc1'
+    DISTROLESS_IMAGE: 'static-debian12'
   go1.23-bookworm:
     CONFIG: 'go1.23-bookworm'
     IMAGE_VERSION: 'v2.4.0-go1.23.4-bookworm.0'
diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
index e0d58773007..026827c2522 100644
--- a/images/releng/ci/variants.yaml
+++ b/images/releng/ci/variants.yaml
@@ -1,4 +1,9 @@
 variants:
+  go1.24-bookworm:
+    CONFIG: 'go1.24-bookworm'
+    GO_VERSION: '1.24rc1'
+    OS_CODENAME: 'bookworm'
+    REVISION: '0'
   go1.23-bookworm:
     CONFIG: 'go1.23-bookworm'
     GO_VERSION: '1.23.4'
diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml
index 908b34b807f..bf9851d89f7 100644
--- a/images/releng/k8s-ci-builder/variants.yaml
+++ b/images/releng/k8s-ci-builder/variants.yaml
@@ -6,7 +6,7 @@ variants:
     OS_CODENAME: 'bullseye'
   next:
     CONFIG: next
-    GO_VERSION: '1.23.4'
+    GO_VERSION: '1.24rc1'
     GO_VERSION_TOOLING: '1.23.4'
     OS_CODENAME: 'bookworm'
   '1.33':