From b874bdeb575f5b347cdaebfca5246cd410fa5d49 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 17 Dec 2021 16:40:58 -0500 Subject: [PATCH 1/3] debian-base: Update dependents to use bullseye-v1.1.0 / buster-v1.10.0 Signed-off-by: Stephen Augustus --- dependencies.yaml | 4 ++-- images/build/debian-iptables/Makefile | 2 +- images/build/debian-iptables/variants.yaml | 4 ++-- images/build/setcap/Makefile | 2 +- images/build/setcap/variants.yaml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3715126b92a..5cecd94fe6f 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -371,7 +371,7 @@ dependencies: 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-]+)*))?)'" - name: "k8s.gcr.io/build-image/debian-base: dependents" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/debian-iptables/Makefile match: DEBIAN_BASE_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 +412,7 @@ dependencies: 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-]+)*))?)'" - name: "k8s.gcr.io/build-image/debian-base: dependents (next candidate)" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/debian-iptables/variants.yaml match: "DEBIAN_BASE_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-iptables/Makefile b/images/build/debian-iptables/Makefile index 7d5f7c3a6c1..5d4b5214fee 100644 --- a/images/build/debian-iptables/Makefile +++ b/images/build/debian-iptables/Makefile @@ -20,7 +20,7 @@ IMAGE=$(REGISTRY)/debian-iptables TAG ?= $(shell git describe --tags --always --dirty) IMAGE_VERSION ?= bullseye-v1.1.0 CONFIG ?= bullseye -DEBIAN_BASE_VERSION ?= bullseye-v1.0.0 +DEBIAN_BASE_VERSION ?= bullseye-v1.1.0 GORUNNER_VERSION ?= v2.3.1-go1.17.3-bullseye.0 ARCH?=amd64 diff --git a/images/build/debian-iptables/variants.yaml b/images/build/debian-iptables/variants.yaml index 8ff6f953e44..69031f9cb66 100644 --- a/images/build/debian-iptables/variants.yaml +++ b/images/build/debian-iptables/variants.yaml @@ -3,9 +3,9 @@ variants: bullseye: CONFIG: 'bullseye' IMAGE_VERSION: 'bullseye-v1.1.0' - DEBIAN_BASE_VERSION: 'bullseye-v1.0.0' + DEBIAN_BASE_VERSION: 'bullseye-v1.1.0' # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' IMAGE_VERSION: 'buster-v1.7.0' - DEBIAN_BASE_VERSION: 'buster-v1.9.0' + DEBIAN_BASE_VERSION: 'buster-v1.10.0' diff --git a/images/build/setcap/Makefile b/images/build/setcap/Makefile index fd6a1f36522..c682736a728 100644 --- a/images/build/setcap/Makefile +++ b/images/build/setcap/Makefile @@ -20,7 +20,7 @@ IMAGE=$(REGISTRY)/setcap TAG ?= $(shell git describe --tags --always --dirty) IMAGE_VERSION ?= bullseye-v1.0.0 CONFIG ?= bullseye -DEBIAN_BASE_VERSION ?= bullseye-v1.0.0 +DEBIAN_BASE_VERSION ?= bullseye-v1.1.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/setcap/variants.yaml b/images/build/setcap/variants.yaml index 4ccc18d1fdb..c287759757f 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -3,9 +3,9 @@ variants: bullseye: CONFIG: 'bullseye' IMAGE_VERSION: 'bullseye-v1.0.0' - DEBIAN_BASE_VERSION: 'bullseye-v1.0.0' + DEBIAN_BASE_VERSION: 'bullseye-v1.1.0' # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' IMAGE_VERSION: 'buster-v2.0.4' - DEBIAN_BASE_VERSION: 'buster-v1.9.0' + DEBIAN_BASE_VERSION: 'buster-v1.10.0' From 9fd66d6961b9985932ff3ba6d53b308da5fdb016 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 17 Dec 2021 17:00:47 -0500 Subject: [PATCH 2/3] debian-iptables: Build bullseye-v1.2.0 / buster-v1.8.0 images Signed-off-by: Stephen Augustus --- dependencies.yaml | 4 ++-- images/build/debian-iptables/Makefile | 2 +- images/build/debian-iptables/variants.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5cecd94fe6f..fd408fc5f48 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -383,7 +383,7 @@ dependencies: match: "DEBIAN_BASE_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-]+)*))?)'" - name: "k8s.gcr.io/build-image/debian-iptables" - version: bullseye-v1.1.0 + version: bullseye-v1.2.0 refPaths: - path: images/build/debian-iptables/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-]+)*))?) @@ -420,7 +420,7 @@ dependencies: match: "DEBIAN_BASE_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-]+)*))?)'" - name: "k8s.gcr.io/build-image/debian-iptables (next candidate)" - version: bullseye-v1.1.0 + version: bullseye-v1.2.0 refPaths: - path: images/build/debian-iptables/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-iptables/Makefile b/images/build/debian-iptables/Makefile index 5d4b5214fee..9a552bfaa1c 100644 --- a/images/build/debian-iptables/Makefile +++ b/images/build/debian-iptables/Makefile @@ -18,7 +18,7 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/debian-iptables TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.1.0 +IMAGE_VERSION ?= bullseye-v1.2.0 CONFIG ?= bullseye DEBIAN_BASE_VERSION ?= bullseye-v1.1.0 GORUNNER_VERSION ?= v2.3.1-go1.17.3-bullseye.0 diff --git a/images/build/debian-iptables/variants.yaml b/images/build/debian-iptables/variants.yaml index 69031f9cb66..2196a9fc038 100644 --- a/images/build/debian-iptables/variants.yaml +++ b/images/build/debian-iptables/variants.yaml @@ -2,10 +2,10 @@ variants: # Debian 11 - Kubernetes 1.23 and newer bullseye: CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.1.0' + IMAGE_VERSION: 'bullseye-v1.2.0' DEBIAN_BASE_VERSION: 'bullseye-v1.1.0' # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' - IMAGE_VERSION: 'buster-v1.7.0' + IMAGE_VERSION: 'buster-v1.8.0' DEBIAN_BASE_VERSION: 'buster-v1.10.0' From 7936bdddf4a62529fd35c77dac39aba13f0331d0 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 17 Dec 2021 17:04:52 -0500 Subject: [PATCH 3/3] setcap: Build bullseye-v1.1.0 / buster-v2.1.0 images Signed-off-by: Stephen Augustus --- dependencies.yaml | 4 ++-- images/build/setcap/Makefile | 2 +- images/build/setcap/variants.yaml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index fd408fc5f48..b180afedc65 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -397,7 +397,7 @@ dependencies: match: GORUNNER_VERSION \?= v\d+\.\d+\.\d+-go\d+.\d+(alpha|beta|rc)?\.?(\d+)?-bullseye\.\d+ - name: "k8s.gcr.io/build-image/setcap" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/setcap/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-]+)*))?) @@ -426,7 +426,7 @@ dependencies: 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-]+)*))?)'" - name: "k8s.gcr.io/build-image/setcap (next candidate)" - version: bullseye-v1.0.0 + version: bullseye-v1.1.0 refPaths: - path: images/build/setcap/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/setcap/Makefile b/images/build/setcap/Makefile index c682736a728..5a92a2114a9 100644 --- a/images/build/setcap/Makefile +++ b/images/build/setcap/Makefile @@ -18,7 +18,7 @@ REGISTRY?="gcr.io/k8s-staging-build-image" IMAGE=$(REGISTRY)/setcap TAG ?= $(shell git describe --tags --always --dirty) -IMAGE_VERSION ?= bullseye-v1.0.0 +IMAGE_VERSION ?= bullseye-v1.1.0 CONFIG ?= bullseye DEBIAN_BASE_VERSION ?= bullseye-v1.1.0 diff --git a/images/build/setcap/variants.yaml b/images/build/setcap/variants.yaml index c287759757f..9f1808db95e 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -2,10 +2,10 @@ variants: # Debian 11 - Kubernetes 1.23 and newer bullseye: CONFIG: 'bullseye' - IMAGE_VERSION: 'bullseye-v1.0.0' + IMAGE_VERSION: 'bullseye-v1.1.0' DEBIAN_BASE_VERSION: 'bullseye-v1.1.0' # Debian 10 - Kubernetes 1.22 and older buster: CONFIG: 'buster' - IMAGE_VERSION: 'buster-v2.0.4' + IMAGE_VERSION: 'buster-v2.1.0' DEBIAN_BASE_VERSION: 'buster-v1.10.0'