diff --git a/dependencies.yaml b/dependencies.yaml index 50fa72cb21a..6ae376d4dc3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -191,10 +191,10 @@ dependencies: match: REVISION:\ '\d+' - name: "k8s.gcr.io/build-image/kube-cross: dependents" - version: v1.16.7-1 + version: v1.23.0-go1.17-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-]+)*))?)-\\d+'" + 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)" @@ -242,10 +242,10 @@ dependencies: match: "CONFIG: 'go\\d+.\\d+-(bullseye|buster)'" - name: "k8s.gcr.io/build-image/kube-cross: dependents (next candidate)" - version: v1.17.0-rc.2-1 + version: v1.23.0-go1.17-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-]+)*))?)-\\d+'" + 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 (for previous release branches) - name: "golang (for previous release branches)" diff --git a/images/k8s-cloud-builder/cloudbuild.yaml b/images/k8s-cloud-builder/cloudbuild.yaml index 5cceb2cef22..a8bd014f50a 100644 --- a/images/k8s-cloud-builder/cloudbuild.yaml +++ b/images/k8s-cloud-builder/cloudbuild.yaml @@ -25,7 +25,7 @@ substitutions: _GIT_TAG: '12345' _PULL_BASE_REF: 'dev' _CONFIG: 'cross0.0' - _KUBE_CROSS_VERSION: 'v0.0.0-0' + _KUBE_CROSS_VERSION: 'v0.0.0-go0.0.0-codename.0' _REGISTRY: 'fake.repository/registry-name' images: diff --git a/images/k8s-cloud-builder/variants.yaml b/images/k8s-cloud-builder/variants.yaml index f3b1df39e27..975622d231b 100644 --- a/images/k8s-cloud-builder/variants.yaml +++ b/images/k8s-cloud-builder/variants.yaml @@ -1,7 +1,7 @@ variants: cross1.17: CONFIG: 'cross1.17' - KUBE_CROSS_VERSION: 'v1.17.0-rc.2-1' + KUBE_CROSS_VERSION: 'v1.23.0-go1.17-buster.0' cross1.16: CONFIG: 'cross1.16' KUBE_CROSS_VERSION: 'v1.16.7-1'