diff --git a/dependencies.yaml b/dependencies.yaml index 89b1734cf7b..54ac2840503 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -186,12 +186,6 @@ dependencies: - 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: "k8s.gcr.io/build-image/kube-cross: dependents buster" - version: v1.23.0-go1.17.5-buster.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-]+)*))?)'" - # Golang (next candidate) - name: "golang (next candidate)" version: 1.18beta1 @@ -231,13 +225,13 @@ dependencies: 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: "k8s.gcr.io/build-image/kube-cross: config variant (next candidate)" - version: go1.17-bullseye + version: go1.18-bullseye refPaths: - path: images/build/cross/variants.yaml match: "CONFIG: 'go\\d+.\\d+-bullseye'" - name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)" - version: v1.24.0-go1.17.5-bullseye.0 + version: v1.24.0-go1.18beta1-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-]+)*))?)'" diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index e138d323f1d..f9e89cd2565 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,13 +1,13 @@ variants: + v1.24-cross1.18-bullseye: + CONFIG: 'cross1.17' + KUBE_CROSS_VERSION: 'v1.24.0-go1.18beta1-bullseye.0' v1.24-cross1.17-bullseye: CONFIG: 'cross1.17' KUBE_CROSS_VERSION: 'v1.24.0-go1.17.5-bullseye.0' v1.23-cross1.17-bullseye: CONFIG: 'cross1.17' KUBE_CROSS_VERSION: 'v1.23.0-go1.17.5-bullseye.0' - v1.23-cross1.17-buster: - CONFIG: 'cross1.17' - KUBE_CROSS_VERSION: 'v1.23.0-go1.17.5-buster.0' v1.22-cross1.16-buster: CONFIG: 'cross1.16' KUBE_CROSS_VERSION: 'v1.22.0-go1.16.12-buster.0'