From cf37e29d3ec9ea12a9445130a120c4611f25d339 Mon Sep 17 00:00:00 2001
From: cpanato <ctadeu@gmail.com>
Date: Fri, 5 Jul 2024 14:53:53 +0200
Subject: [PATCH] golang: Build 1.23rc1 images

Signed-off-by: cpanato <ctadeu@gmail.com>
---
 dependencies.yaml                          | 38 ++++++++++++++++++++--
 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, 59 insertions(+), 3 deletions(-)

diff --git a/dependencies.yaml b/dependencies.yaml
index fc6d9f92280..98bac59f708 100644
--- a/dependencies.yaml
+++ b/dependencies.yaml
@@ -116,6 +116,20 @@ dependencies:
       match: REVISION:\ '\d+'
 
   # go-runner
+  - name: "registry.k8s.io/build-image/go-runner (go1.23-bookworm)"
+    version: v2.3.1-go1.23rc1-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.23-bookworm)"
+    version: 0
+    refPaths:
+    - path: images/build/go-runner/Makefile
+      match: REVISION \?= \d+
+    - path: images/build/go-runner/variants.yaml
+      match: REVISION:\ '\d+'
+
   - name: "registry.k8s.io/build-image/go-runner (go1.22-bookworm)"
     version: v2.3.1-go1.22.5-bookworm.0
     refPaths:
@@ -131,6 +145,26 @@ dependencies:
       match: REVISION:\ '\d+'
 
   # kube-cross
+  - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
+    version: v1.31.0-go1.23rc1-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.31-go1.23)"
+    version: go1.23-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.31-go1.23)"
+    version: 0
+    refPaths:
+    - path: images/build/cross/Makefile
+      match: REVISION \?= \d+
+    - path: images/build/cross/variants.yaml
+      match: REVISION:\ '\d+'
+
   - name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
     version: v1.31.0-go1.22.5-bullseye.0
     refPaths:
@@ -270,7 +304,7 @@ dependencies:
 
   # Golang (next candidate)
   - name: "golang (next candidate)"
-    version: 1.22
+    version: 1.23rc1
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
@@ -289,7 +323,7 @@ dependencies:
       match: REVISION:\ '\d+'
 
   - name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
-    version: go1.22-bullseye
+    version: go1.23-bullseye
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "CONFIG: 'go\\d+.\\d+-bullseye'"
diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml
index 4c5a6fe8ad1..cd54ecdcaec 100644
--- a/images/build/cross/variants.yaml
+++ b/images/build/cross/variants.yaml
@@ -1,4 +1,13 @@
 variants:
+  v1.31-go1.23-bullseye:
+    CONFIG: 'go1.23-bullseye'
+    TYPE: 'default'
+    IMAGE_VERSION: 'v1.31.0-go1.23rc1-bullseye.0'
+    KUBERNETES_VERSION: 'v1.31.0'
+    GO_VERSION: '1.23rc1'
+    GO_MAJOR_VERSION: '1.23'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
   v1.31-go1.22-bullseye:
     CONFIG: 'go1.22-bullseye'
     TYPE: 'default'
diff --git a/images/build/go-runner/variants.yaml b/images/build/go-runner/variants.yaml
index 3aec0c78874..8b4d28576b7 100644
--- a/images/build/go-runner/variants.yaml
+++ b/images/build/go-runner/variants.yaml
@@ -1,4 +1,12 @@
 variants:
+  go1.23-bookworm:
+    CONFIG: 'go1.23-bookworm'
+    IMAGE_VERSION: 'v2.3.1-go1.23rc1-bookworm.0'
+    GO_MAJOR_VERSION: '1.23'
+    OS_CODENAME: 'bookworm'
+    REVISION: '0'
+    GO_VERSION: '1.23rc1'
+    DISTROLESS_IMAGE: 'static-debian12'
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
     IMAGE_VERSION: 'v2.3.1-go1.22.5-bookworm.0'
diff --git a/images/releng/ci/variants.yaml b/images/releng/ci/variants.yaml
index 3a0a7c607ff..0210e866719 100644
--- a/images/releng/ci/variants.yaml
+++ b/images/releng/ci/variants.yaml
@@ -1,4 +1,9 @@
 variants:
+  go1.23-bookworm:
+    CONFIG: 'go1.23-bookworm'
+    GO_VERSION: '1.23rc1'
+    OS_CODENAME: 'bookworm'
+    REVISION: '0'
   go1.22-bookworm:
     CONFIG: 'go1.22-bookworm'
     GO_VERSION: '1.22.5'
diff --git a/images/releng/k8s-ci-builder/variants.yaml b/images/releng/k8s-ci-builder/variants.yaml
index 507d334bcc9..7a692d99dd5 100644
--- a/images/releng/k8s-ci-builder/variants.yaml
+++ b/images/releng/k8s-ci-builder/variants.yaml
@@ -5,7 +5,7 @@ variants:
     OS_CODENAME: 'bullseye'
   next:
     CONFIG: next
-    GO_VERSION: '1.22.5'
+    GO_VERSION: '1.23rc1'
     OS_CODENAME: 'bookworm'
   '1.31':
     CONFIG: '1.31'