Skip to content

Commit

Permalink
Update k8s-cloud-builder and k8s-ci-builder to Go 1.22.8/1.23.2
Browse files Browse the repository at this point in the history
  • Loading branch information
haitch committed Oct 21, 2024
1 parent 159d5f0 commit b162c3f
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -298,32 +298,32 @@ dependencies:
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.31-cross1.23)"
version: v1.31.0-go1.23.0-bullseye.0
version: v1.31.0-go1.23.2-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-]+)*))?)'"

# 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.6-bullseye.0
version: v1.31.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.30-cross1.22)"
version: v1.30.0-go1.22.6-bullseye.0
version: v1.30.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.29-cross1.22)"
version: v1.29.0-go1.22.6-bullseye.0
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.6-bullseye.0
version: v1.28.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-]+)*))?)'"
Expand All @@ -346,28 +346,28 @@ dependencies:

# Golang (previous release branch: 1.31)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.31)"
version: 1.22.6
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.30)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.30)"
version: 1.22.6
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.29)
- name: "golang: after kubernetes/kubernetes update (previous release branches: 1.29)"
version: 1.22.6
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.6
version: 1.22.8
refPaths:
- path: images/releng/k8s-ci-builder/variants.yaml
match: \d+.\d+(alpha|beta|rc)?\.?(\d+)?
Expand Down
10 changes: 5 additions & 5 deletions images/k8s-cloud-builder/variants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ variants:
KUBE_CROSS_VERSION: 'v1.32.0-go1.23.2-bullseye.0'
v1.31-cross1.23-bullseye:
CONFIG: 'cross1.23'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.0-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.23.2-bullseye.0'
# 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.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.31.0-go1.22.8-bullseye.0'
v1.30-cross1.22-bullseye:
CONFIG: 'cross1.22'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.30.0-go1.22.8-bullseye.0'
v1.29-cross1.22-bullseye:
CONFIG: 'cross1.21'
KUBE_CROSS_VERSION: 'v1.29.0-go1.22.6-bullseye.0'
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.6-bullseye.0'
KUBE_CROSS_VERSION: 'v1.28.0-go1.22.8-bullseye.0'
10 changes: 5 additions & 5 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.6'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'
next:
CONFIG: next
Expand All @@ -13,17 +13,17 @@ variants:
OS_CODENAME: 'bullseye'
'1.31':
CONFIG: '1.31'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'
'1.30':
CONFIG: '1.30'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'
'1.29':
CONFIG: '1.29'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'
'1.28':
CONFIG: '1.28'
GO_VERSION: '1.22.6'
GO_VERSION: '1.22.8'
OS_CODENAME: 'bullseye'

0 comments on commit b162c3f

Please sign in to comment.