diff --git a/dependencies.yaml b/dependencies.yaml index 89b1734cf7b..3715126b92a 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-]+)*))?)'" @@ -369,7 +363,7 @@ dependencies: match: "OS_CODENAME: 'bullseye'" - name: "k8s.gcr.io/build-image/debian-base" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/debian-base/Makefile match: IMAGE_VERSION\ \?=\ bullseye-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?) @@ -412,7 +406,7 @@ dependencies: # Base images (next candidate) - name: "k8s.gcr.io/build-image/debian-base (next candidate)" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/debian-base/variants.yaml match: "IMAGE_VERSION: 'bullseye-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/build/debian-base/Makefile b/images/build/debian-base/Makefile index dd5b37d3276..5a4dc586ed1 100755 --- a/images/build/debian-base/Makefile +++ b/images/build/debian-base/Makefile @@ -19,7 +19,7 @@ IMAGE ?= $(REGISTRY)/debian-base BUILD_IMAGE ?= debian-build TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.0.0 +IMAGE_VERSION ?= bullseye-v1.1.0 CONFIG ?= bullseye TAR_FILE ?= rootfs.tar diff --git a/images/build/debian-base/variants.yaml b/images/build/debian-base/variants.yaml index 2e8a06f6792..fc2bef72e2d 100644 --- a/images/build/debian-base/variants.yaml +++ b/images/build/debian-base/variants.yaml @@ -2,8 +2,8 @@ variants: # Debian 11 - Kubernetes 1.23 and newer bullseye: CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.0.0' + IMAGE_VERSION: 'bullseye-v1.1.0' # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' - IMAGE_VERSION: 'buster-v1.9.0' + IMAGE_VERSION: 'buster-v1.10.0' 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'