Skip to content

build kube-cross go1.23.6 for release 1.30/1.31/1.29 #3929

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies:
# Golang (for images, previous stable)
# To be updated before kubernetes/kubernetes update
- name: "golang (previous)"
version: 1.22.12
version: 1.23.6
refPaths:
- path: images/build/cross/variants.yaml
match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
Expand Down Expand Up @@ -282,21 +282,21 @@ dependencies:
- path: images/build/cross/variants.yaml
match: REVISION:\ '\d+'

# kube-cross (Kubernetes v1.31, Go 1.22)
# kube-cross (Kubernetes v1.31, Go 1.23)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.22)"
version: v1.31.0-go1.22.12-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.31-go1.23)"
version: v1.31.0-go1.23.6-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.22)"
version: go1.22-bullseye
- 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.22)"
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.31-go1.23)"
version: 0
refPaths:
- path: images/build/cross/Makefile
Expand All @@ -306,19 +306,19 @@ dependencies:

# kube-cross (Kubernetes v1.30)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.22)"
version: v1.30.0-go1.22.12-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.30-go1.23)"
version: v1.30.0-go1.23.6-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.30-go1.22)"
version: go1.22-bullseye
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.30-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.30-go1.22)"
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.30-go1.23)"
version: 0
refPaths:
- path: images/build/cross/Makefile
Expand All @@ -328,19 +328,19 @@ dependencies:

# kube-cross (Kubernetes v1.29)
# To be updated before kubernetes/kubernetes update
- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.22)"
version: v1.29.0-go1.22.12-bullseye.0
- name: "registry.k8s.io/build-image/kube-cross (v1.29-go1.23)"
version: v1.29.0-go1.23.6-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.29-go1.22)"
version: go1.22-bullseye
- name: "registry.k8s.io/build-image/kube-cross: config variant (v1.29-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.29-go1.22)"
- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.29-go1.23)"
version: 0
refPaths:
- path: images/build/cross/Makefile
Expand Down
29 changes: 10 additions & 19 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,21 @@ variants:
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.31-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.31.0-go1.22.12-bullseye.0'
KUBERNETES_VERSION: 'v1.31.0'
GO_VERSION: '1.22.12'
GO_MAJOR_VERSION: '1.22'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.30-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
v1.30-go1.23-bullseye:
CONFIG: 'go1.23-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.30.0-go1.22.12-bullseye.0'
IMAGE_VERSION: 'v1.30.0-go1.23.6-bullseye.0'
KUBERNETES_VERSION: 'v1.30.0'
GO_VERSION: '1.22.12'
GO_MAJOR_VERSION: '1.22'
GO_VERSION: '1.23.6'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bullseye'
REVISION: '0'
v1.29-go1.22-bullseye:
CONFIG: 'go1.22-bullseye'
v1.29-go1.23-bullseye:
CONFIG: 'go1.23-bullseye'
TYPE: 'default'
IMAGE_VERSION: 'v1.29.0-go1.22.12-bullseye.0'
IMAGE_VERSION: 'v1.29.0-go1.23.6-bullseye.0'
KUBERNETES_VERSION: 'v1.29.0'
GO_VERSION: '1.22.12'
GO_MAJOR_VERSION: '1.22'
GO_VERSION: '1.23.6'
GO_MAJOR_VERSION: '1.23'
OS_CODENAME: 'bullseye'
REVISION: '0'