Skip to content

Commit

Permalink
setcap: Build buster-v2.0.0 image
Browse files Browse the repository at this point in the history
Uses debian-base:buster-v1.6.0.

Note: the image major version is arbitrarily bumped here to dissuade any
inferences that it must match the debian-base image tag

Signed-off-by: Stephen Augustus <foo@auggie.dev>
  • Loading branch information
justaugustus committed Apr 9, 2021
1 parent 1cf9291 commit 7e35273
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
12 changes: 12 additions & 0 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,10 @@ dependencies:
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-]+)*))?)
- path: images/build/debian-iptables/variants.yaml
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-]+)*))?)'
- path: images/build/setcap/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-]+)*))?)
- path: images/build/setcap/variants.yaml
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-hyperkube-base"
version: buster-v1.5.0
Expand All @@ -208,3 +212,11 @@ dependencies:
refPaths:
- path: images/build/debian-hyperkube-base/Makefile
match: BASEIMAGE\?\=\$\(BASE_REGISTRY\)\/debian-iptables-\$\(ARCH\):[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.0
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-]+)*))?)
- path: images/build/setcap/variants.yaml
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-]+)*))?)'
4 changes: 2 additions & 2 deletions images/build/setcap/Makefile
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 ?= buster-v1.4.0
IMAGE_VERSION ?= buster-v2.0.0
CONFIG ?= buster
DEBIAN_BASE_VERSION ?= buster-v1.4.0
DEBIAN_BASE_VERSION ?= buster-v1.6.0

ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
Expand Down
4 changes: 2 additions & 2 deletions images/build/setcap/variants.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variants:
buster:
CONFIG: 'buster'
IMAGE_VERSION: 'buster-v1.4.0'
DEBIAN_BASE_VERSION: 'buster-v1.4.0'
IMAGE_VERSION: 'buster-v2.0.0'
DEBIAN_BASE_VERSION: 'buster-v1.6.0'

0 comments on commit 7e35273

Please sign in to comment.