Skip to content

Commit

Permalink
Merge pull request #3146 from saschagrunert/kube-cross-bookworm
Browse files Browse the repository at this point in the history
kube-cross v1.28: switch to debian bookworm
  • Loading branch information
k8s-ci-robot committed Jul 14, 2023
2 parents 5712a3a + 13fe351 commit ce31a60
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -189,16 +189,16 @@ dependencies:

# kube-cross
- name: "registry.k8s.io/build-image/kube-cross (v1.28-go1.21)"
version: v1.28.0-go1.21rc2-bullseye.0
version: v1.28.0-go1.21rc2-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)"
version: go1.21-bullseye
version: go1.21-bookworm
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
match: "CONFIG: 'go\\d+.\\d+-bookworm'"

- name: "registry.k8s.io/build-image/kube-cross: image revision (v1.28-go1.21)"
version: 0
Expand Down Expand Up @@ -333,10 +333,10 @@ dependencies:
match: REVISION:\ '\d+'

- name: "registry.k8s.io/build-image/kube-cross: config variant (next candidate)"
version: go1.21-bullseye
version: go1.21-bookworm
refPaths:
- path: images/build/cross/variants.yaml
match: "CONFIG: 'go\\d+.\\d+-bullseye'"
match: "CONFIG: 'go\\d+.\\d+-bookworm'"

# Golang (previous release branches: 1.26)
- name: "golang (previous release branches: 1.26)"
Expand Down
8 changes: 4 additions & 4 deletions images/build/cross/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
variants:
v1.28-go1.21-bullseye:
CONFIG: 'go1.21-bullseye'
v1.28-go1.21-bookworm:
CONFIG: 'go1.21-bookworm'
TYPE: 'default'
IMAGE_VERSION: 'v1.28.0-go1.21rc2-bullseye.0'
IMAGE_VERSION: 'v1.28.0-go1.21rc2-bookworm.0'
KUBERNETES_VERSION: 'v1.28.0'
GO_VERSION: '1.21rc2'
GO_MAJOR_VERSION: '1.21'
OS_CODENAME: 'bullseye'
OS_CODENAME: 'bookworm'
REVISION: '0'
PROTOBUF_VERSION: '3.19.4'
v1.27-go1.20-bullseye:
Expand Down

0 comments on commit ce31a60

Please sign in to comment.