diff --git a/dependencies.yaml b/dependencies.yaml index 6994da25ce1..fa880fefdb8 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -195,16 +195,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 @@ -339,10 +339,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)" diff --git a/images/build/cross/variants.yaml b/images/build/cross/variants.yaml index 83df56d8388..89dcbc6300b 100644 --- a/images/build/cross/variants.yaml +++ b/images/build/cross/variants.yaml @@ -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: