From de96bd7d47dfdc4ba18574037c18d63355241a67 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 22 Jun 2021 22:00:09 -0400 Subject: [PATCH 1/3] dependencies.yaml: Update dependents to use debian-base:buster-v1.8.0 Signed-off-by: Stephen Augustus --- dependencies.yaml | 2 +- images/build/debian-iptables/Makefile | 2 +- images/build/debian-iptables/variants.yaml | 2 +- images/build/setcap/Makefile | 2 +- images/build/setcap/variants.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 93a7f91b1e0..4ff702ac73e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -233,7 +233,7 @@ dependencies: match: '[a-zA-Z]+\-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: buster-v1.7.2 + version: buster-v1.8.0 refPaths: - path: images/build/debian-iptables/Makefile match: DEBIAN_BASE_VERSION\ \?=\ [a-zA-Z]+\-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 fccf75d762a..202e5a955f8 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 ?= buster-v1.6.4 CONFIG ?= buster -DEBIAN_BASE_VERSION ?= buster-v1.7.2 +DEBIAN_BASE_VERSION ?= buster-v1.8.0 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x diff --git a/images/build/debian-iptables/variants.yaml b/images/build/debian-iptables/variants.yaml index c19b1a4fee4..4746afcb4db 100644 --- a/images/build/debian-iptables/variants.yaml +++ b/images/build/debian-iptables/variants.yaml @@ -2,4 +2,4 @@ variants: buster: CONFIG: 'buster' IMAGE_VERSION: 'buster-v1.6.4' - DEBIAN_BASE_VERSION: 'buster-v1.7.2' + DEBIAN_BASE_VERSION: 'buster-v1.8.0' diff --git a/images/build/setcap/Makefile b/images/build/setcap/Makefile index d8e17e4d810..7843f80ed17 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 ?= buster-v2.0.2 CONFIG ?= buster -DEBIAN_BASE_VERSION ?= buster-v1.7.2 +DEBIAN_BASE_VERSION ?= buster-v1.8.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 448e30671df..d9b2632f4d5 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -2,4 +2,4 @@ variants: buster: CONFIG: 'buster' IMAGE_VERSION: 'buster-v2.0.2' - DEBIAN_BASE_VERSION: 'buster-v1.7.2' + DEBIAN_BASE_VERSION: 'buster-v1.8.0' From a56561522da6e1f42078a52ffcf6c86898dffe87 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 22 Jun 2021 22:07:32 -0400 Subject: [PATCH 2/3] debian-iptables: Build buster-v1.6.5 image Signed-off-by: Stephen Augustus --- dependencies.yaml | 2 +- images/build/debian-iptables/Makefile | 2 +- images/build/debian-iptables/variants.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 4ff702ac73e..c5f3450fd04 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -245,7 +245,7 @@ dependencies: match: '[a-zA-Z]+\-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: buster-v1.6.4 + version: buster-v1.6.5 refPaths: - path: images/build/debian-iptables/Makefile match: IMAGE_VERSION\ \?=\ [a-zA-Z]+\-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 202e5a955f8..4da2bc1f6b4 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 ?= buster-v1.6.4 +IMAGE_VERSION ?= buster-v1.6.5 CONFIG ?= buster DEBIAN_BASE_VERSION ?= buster-v1.8.0 diff --git a/images/build/debian-iptables/variants.yaml b/images/build/debian-iptables/variants.yaml index 4746afcb4db..d3383b61764 100644 --- a/images/build/debian-iptables/variants.yaml +++ b/images/build/debian-iptables/variants.yaml @@ -1,5 +1,5 @@ variants: buster: CONFIG: 'buster' - IMAGE_VERSION: 'buster-v1.6.4' + IMAGE_VERSION: 'buster-v1.6.5' DEBIAN_BASE_VERSION: 'buster-v1.8.0' From a523be478337472ec41a94f737d505e5238e61e3 Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Tue, 22 Jun 2021 22:08:21 -0400 Subject: [PATCH 3/3] setcap: Build buster-v2.0.3 image Signed-off-by: Stephen Augustus --- dependencies.yaml | 2 +- images/build/setcap/Makefile | 2 +- images/build/setcap/variants.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index c5f3450fd04..108db7b3a59 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -253,7 +253,7 @@ dependencies: match: '[a-zA-Z]+\-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" - version: buster-v2.0.2 + version: buster-v2.0.3 refPaths: - path: images/build/setcap/Makefile match: IMAGE_VERSION\ \?=\ [a-zA-Z]+\-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 7843f80ed17..cb081677071 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 ?= buster-v2.0.2 +IMAGE_VERSION ?= buster-v2.0.3 CONFIG ?= buster DEBIAN_BASE_VERSION ?= buster-v1.8.0 diff --git a/images/build/setcap/variants.yaml b/images/build/setcap/variants.yaml index d9b2632f4d5..1d29938e133 100644 --- a/images/build/setcap/variants.yaml +++ b/images/build/setcap/variants.yaml @@ -1,5 +1,5 @@ variants: buster: CONFIG: 'buster' - IMAGE_VERSION: 'buster-v2.0.2' + IMAGE_VERSION: 'buster-v2.0.3' DEBIAN_BASE_VERSION: 'buster-v1.8.0'