update go images for 1.29 and 1.28 release branches and drop 1.24 config

dependencies.yaml

@@ -129,15 +129,15 @@ dependencies:
   # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
   # - v1.100-go1.17-bullseye.0 does not
   - name: "Kubernetes version (stable.0)"
-    version: v1.28.0
+    version: v1.29.0
     refPaths:
     - path: images/build/cross/Makefile
       match: KUBERNETES_VERSION\ \?=\ v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
     - path: images/build/cross/variants.yaml
       match: "KUBERNETES_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: "Kubernetes version (next candidate.0)"
-    version: v1.28.0
+    version: v1.29.0
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "KUBERNETES_VERSION: 'v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
@@ -186,106 +186,113 @@ dependencies:
       match: REVISION:\ '\d+'
 
   # kube-cross
-  - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
-    version: v1.28.0-go1.21.0-bookworm.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.21)"
+    version: v1.29.0-go1.21.0-bookworm.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.28-go1.21)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.29-go1.21)"
     version: go1.21-bookworm
     refPaths:
     - path: images/build/cross/variants.yaml
       match: "CONFIG: 'go\\d+.\\d+-bookworm'"
 
-  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.28-go1.21)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.29-go1.21)"
     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.27-go1.20)"
-    version: v1.27.0-go1.20.7-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.20)"
+    version: v1.28.0-go1.20.7-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.27-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.28-go1.20)"
     version: go1.20-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.27-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.28-go1.20)"
     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.26-go1.20)"
-    version: v1.26.0-go1.20.7-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.27-go1.20)"
+    version: v1.27.0-go1.20.7-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.26-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.27-go1.20)"
     version: go1.20-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.26-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.27-go1.20)"
     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.25-go1.20)"
-    version: v1.25.0-go1.20.7-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.26-go1.20)"
+    version: v1.26.0-go1.20.7-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.25-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.26-go1.20)"
     version: go1.20-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.25-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.26-go1.20)"
     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.24-go1.20)"
-    version: v1.24.0-go1.20.7-bullseye.0
+  - name: "registry.k8s.io/build-image/kube-cross (v1.25-go1.20)"
+    version: v1.25.0-go1.20.7-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.24-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: config variant (v1.25-go1.20)"
     version: go1.20-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.24-go1.20)"
+  - name: "registry.k8s.io/build-image/kube-cross: image revision (v1.25-go1.20)"
     version: 0
     refPaths:
     - path: images/build/cross/Makefile
       match: REVISION \?= \d+
     - path: images/build/cross/variants.yaml
       match: REVISION:\ '\d+'
 
+  # TODO: uncomment when we have the cross available and then need to build this one as well
+  # - name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.28-cross1.20)"
+  #   version: v1.28.0-go1.20.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.27-cross1.20)"
     version: v1.27.0-go1.20.7-bullseye.0
     refPaths:
@@ -304,12 +311,6 @@ dependencies:
     - 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.24-cross1.20)"
-    version: v1.24.0-go1.20.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: protobuf version"
     version: 23.4
     refPaths:
@@ -342,8 +343,8 @@ dependencies:
     - path: images/build/cross/variants.yaml
       match: "CONFIG: 'go\\d+.\\d+-bookworm'"
 
-  # Golang (previous release branches: 1.26)
-  - name: "golang (previous release branches: 1.26)"
+  # Golang (previous release branches: 1.28)
+  - name: "golang (previous release branches: 1.28)"
     version: 1.20.7
     refPaths:
     - path: images/build/cross/variants.yaml
@@ -353,14 +354,14 @@ dependencies:
     - path: images/releng/ci/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
+  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
     version: 1.20.7
     refPaths:
     - path: images/releng/k8s-ci-builder/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  # Golang (previous release branches: 1.25)
-  - name: "golang (previous release branches: 1.25)"
+  # Golang (previous release branches: 1.27)
+  - name: "golang (previous release branches: 1.27)"
     version: 1.20.7
     refPaths:
     - path: images/build/cross/variants.yaml
@@ -370,14 +371,14 @@ dependencies:
     - path: images/releng/ci/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.25)"
+  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.27)"
     version: 1.20.7
     refPaths:
     - path: images/releng/k8s-ci-builder/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  # Golang (previous release branches: 1.24)
-  - name: "golang (previous release branches: 1.24)"
+  # Golang (previous release branches: 1.26)
+  - name: "golang (previous release branches: 1.26)"
     version: 1.20.7
     refPaths:
     - path: images/build/cross/variants.yaml
@@ -387,7 +388,7 @@ dependencies:
     - path: images/releng/ci/variants.yaml
       match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
 
-  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.24)"
+  - name: "golang: after kubernetes/kubernetes update (previous release branches: 1.26)"
     version: 1.20.7
     refPaths:
     - path: images/releng/k8s-ci-builder/variants.yaml

images/build/cross/Makefile

@@ -27,7 +27,7 @@ IMGNAME = kube-cross
 # Example:
 # - v1.100.0-go1.17-bullseye.0 satisfies SemVer regex, while:
 # - v1.100-go1.17-bullseye.0 does not
-KUBERNETES_VERSION ?= v1.28.0
+KUBERNETES_VERSION ?= v1.29.0
 GO_VERSION ?= 1.21.0
 GO_MAJOR_VERSION ?= 1.21
 OS_CODENAME ?= bookworm

images/build/cross/variants.yaml

@@ -1,13 +1,22 @@
 variants:
-  v1.28-go1.21-bookworm:
+  v1.29-go1.21-bookworm:
     CONFIG: 'go1.21-bookworm'
     TYPE: 'default'
-    IMAGE_VERSION: 'v1.28.0-go1.21.0-bookworm.0'
-    KUBERNETES_VERSION: 'v1.28.0'
+    IMAGE_VERSION: 'v1.29.0-go1.21.0-bookworm.0'
+    KUBERNETES_VERSION: 'v1.29.0'
     GO_VERSION: '1.21.0'
     GO_MAJOR_VERSION: '1.21'
     OS_CODENAME: 'bookworm'
     REVISION: '0'
+  v1.28-go1.20-bullseye:
+    CONFIG: 'go1.20-bullseye'
+    TYPE: 'default'
+    IMAGE_VERSION: 'v1.28.0-go1.20.7-bullseye.0'
+    KUBERNETES_VERSION: 'v1.28.0'
+    GO_VERSION: '1.20.7'
+    GO_MAJOR_VERSION: '1.20'
+    OS_CODENAME: 'bullseye'
+    REVISION: '0'
   v1.27-go1.20-bullseye:
     CONFIG: 'go1.20-bullseye'
     TYPE: 'default'
@@ -35,12 +44,3 @@ variants:
     GO_MAJOR_VERSION: '1.20'
     OS_CODENAME: 'bullseye'
     REVISION: '0'
-  v1.24-go1.20-bullseye:
-    CONFIG: 'go1.20-bullseye'
-    TYPE: 'default'
-    IMAGE_VERSION: 'v1.24.0-go1.20.7-bullseye.0'
-    KUBERNETES_VERSION: 'v1.24.0'
-    GO_VERSION: '1.20.7'
-    GO_MAJOR_VERSION: '1.20'
-    OS_CODENAME: 'bullseye'
-    REVISION: '0'

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

@@ -7,10 +7,14 @@ variants:
     CONFIG: next
     GO_VERSION: '1.21.0'
     OS_CODENAME: 'bookworm'
-  '1.28':
-    CONFIG: '1.28'
+  '1.29':
+    CONFIG: '1.29'
     GO_VERSION: '1.21.0'
     OS_CODENAME: 'bookworm'
+  '1.28':
+    CONFIG: '1.28'
+    GO_VERSION: '1.20.7'
+    OS_CODENAME: 'bullseye'
   '1.27':
     CONFIG: '1.27'
     GO_VERSION: '1.20.7'
@@ -23,7 +27,3 @@ variants:
     CONFIG: '1.25'
     GO_VERSION: '1.20.7'
     OS_CODENAME: 'bullseye'
-  '1.24':
-    CONFIG: '1.24'
-    GO_VERSION: '1.20.7'
-    OS_CODENAME: 'bullseye'