Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

debian-base: Update dependents to use bullseye-v1.1.0 / buster-v1.10.0 #2373

Merged
merged 3 commits into from
Dec 17, 2021
Merged

debian-base: Update dependents to use bullseye-v1.1.0 / buster-v1.10.0 #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b874bde
debian-base: Update dependents to use bullseye-v1.1.0 / buster-v1.10.0
justaugustus Dec 17, 2021
9fd66d6
debian-iptables: Build bullseye-v1.2.0 / buster-v1.8.0 images
justaugustus Dec 17, 2021
7936bdd
setcap: Build bullseye-v1.1.0 / buster-v2.1.0 images
justaugustus Dec 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-]+)*))?)
Expand All @@ -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-]+)*))?)
Expand All @@ -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-]+)*))?)
Expand All @@ -412,21 +412,21 @@ 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-]+)*))?)'"
- path: images/build/setcap/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-]+)*))?)'"

- 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-]+)*))?)'"

- 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-]+)*))?)'"
Expand Down
4 changes: 2 additions & 2 deletions images/build/debian-iptables/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ 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.0.0
DEBIAN_BASE_VERSION ?= bullseye-v1.1.0
GORUNNER_VERSION ?= v2.3.1-go1.17.3-bullseye.0

ARCH?=amd64
Expand Down
8 changes: 4 additions & 4 deletions images/build/debian-iptables/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ variants:
# Debian 11 - Kubernetes 1.23 and newer
bullseye:
CONFIG: 'bullseye'
IMAGE_VERSION: 'bullseye-v1.1.0'
DEBIAN_BASE_VERSION: 'bullseye-v1.0.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'
DEBIAN_BASE_VERSION: 'buster-v1.9.0'
IMAGE_VERSION: 'buster-v1.8.0'
DEBIAN_BASE_VERSION: 'buster-v1.10.0'
4 changes: 2 additions & 2 deletions images/build/setcap/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ 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.0.0
DEBIAN_BASE_VERSION ?= bullseye-v1.1.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
8 changes: 4 additions & 4 deletions images/build/setcap/variants.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ variants:
# Debian 11 - Kubernetes 1.23 and newer
bullseye:
CONFIG: 'bullseye'
IMAGE_VERSION: 'bullseye-v1.0.0'
DEBIAN_BASE_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'
DEBIAN_BASE_VERSION: 'buster-v1.9.0'
IMAGE_VERSION: 'buster-v2.1.0'
DEBIAN_BASE_VERSION: 'buster-v1.10.0'