Skip to content

Commit 0a7c325

Browse files
committed
setcap: Build bullseye-v1.0.0 images
Signed-off-by: Stephen Augustus <[email protected]>
1 parent f50fdab commit 0a7c325

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

dependencies.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -450,9 +450,8 @@ dependencies:
450450
refPaths:
451451
- path: images/build/debian-iptables/variants.yaml
452452
match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
453-
# TODO(bullseye): Uncomment as part of https://github.com/kubernetes/release/pull/2249
454-
#- path: images/build/setcap/variants.yaml
455-
# match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
453+
- path: images/build/setcap/variants.yaml
454+
match: "DEBIAN_BASE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
456455

457456
- name: "k8s.gcr.io/build-image/debian-iptables (next candidate)"
458457
version: bullseye-v1.0.0
@@ -461,7 +460,7 @@ dependencies:
461460
match: "IMAGE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"
462461

463462
- name: "k8s.gcr.io/build-image/setcap (next candidate)"
464-
version: buster-v2.0.4
463+
version: bullseye-v1.0.0
465464
refPaths:
466465
- path: images/build/setcap/variants.yaml
467466
match: "IMAGE_VERSION: '(bullseye|buster)-v((([0-9]+)\\.([0-9]+)\\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)'"

images/build/setcap/variants.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
variants:
2+
# Debian 11 - Kubernetes 1.23 and newer
3+
bullseye:
4+
CONFIG: 'bullseye'
5+
IMAGE_VERSION: 'bullseye-v1.0.0'
6+
DEBIAN_BASE_VERSION: 'bullseye-v1.0.0'
7+
# Debian 10 - Kubernetes 1.22 and older
28
buster:
39
CONFIG: 'buster'
410
IMAGE_VERSION: 'buster-v2.0.4'

0 commit comments

Comments
 (0)