Skip to content
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

Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.9 and drop config for release-1.28 #3845

Merged
merged 1 commit into from
Nov 28, 2024
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
25 changes: 6 additions & 19 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,25 +283,19 @@ dependencies:

# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
- name: "registry.k8s.io/build-image/kube-cross: dependents k8s-cloud-builder (v1.31-cross1.22)"
version: v1.31.0-go1.22.8-bullseye.0
version: v1.31.0-go1.22.9-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.30-cross1.22)"
version: v1.30.0-go1.22.8-bullseye.0
version: v1.30.0-go1.22.9-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.29-cross1.22)"
version: v1.29.0-go1.22.8-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.28-cross1.22)"
version: v1.28.0-go1.22.8-bullseye.0
version: v1.29.0-go1.22.9-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-]+)*))?)'"
Expand All @@ -324,28 +318,21 @@ dependencies:

# Golang (previous release branch: 1.31)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
version: 1.22.8
version: 1.22.9
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.30)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
version: 1.22.8
version: 1.22.9
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.29)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.22.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?

# Golang (previous release branch: 1.28)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.28)"
version: 1.22.8
version: 1.22.9
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
9 changes: 3 additions & 6 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,10 @@ variants:
# TODO: remove this after upgrade to Go 1.23 is finalized and there's on risk of reverting
v1.31-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.8-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.9-bullseye.0'
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.8-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.9-bullseye.0'
v1.29-cross1.22-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.8-bullseye.0'
v1.28-cross1.22-bullseye:
CONFIG: 'cross1.20'
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.8-bullseye.0'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.9-bullseye.0'
12 changes: 4 additions & 8 deletions images/releng/k8s-ci-builder/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variants:
default:
CONFIG: default
GO_VERSION: '1.22.8'
GO_VERSION: '1.22.9'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
Expand All @@ -13,17 +13,13 @@ variants:
OS_CODENAME: 'bullseye'
'1.31':
CONFIG: '1.31'
GO_VERSION: '1.22.8'
GO_VERSION: '1.22.9'
OS_CODENAME: 'bullseye'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22.8'
GO_VERSION: '1.22.9'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.22.8'
GO_VERSION: '1.22.9'
OS_CODENAME: 'bullseye'