Skip to content

Commit

Permalink
Update setcap to buster-v2.0.1 and add setcap to dependencies.yaml
Browse files Browse the repository at this point in the history
Signed-off-by: Marko Mudrinić <mudrinic.mare@gmail.com>
  • Loading branch information
xmudrii committed May 27, 2021
1 parent 5d96d97 commit c3d8507
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images.
readonly __default_debian_iptables_version=buster-v1.6.1
readonly __default_go_runner_version=v2.3.1-go1.16.4-buster.0
readonly __default_setcap_version=buster-v2.0.1

# These are the base images for the Docker-wrapped binaries.
readonly KUBE_GORUNNER_IMAGE="${KUBE_GORUNNER_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/go-runner:$__default_go_runner_version}"
Expand All @@ -97,7 +98,7 @@ readonly KUBE_SCHEDULER_BASE_IMAGE="${KUBE_SCHEDULER_BASE_IMAGE:-$KUBE_GORUNNER_
readonly KUBE_PROXY_BASE_IMAGE="${KUBE_PROXY_BASE_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/debian-iptables:$__default_debian_iptables_version}"

# This is the image used in a multi-stage build to apply capabilities to Docker-wrapped binaries.
readonly KUBE_BUILD_SETCAP_IMAGE="${KUBE_BUILD_SETCAP_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/setcap:buster-v1.4.0}"
readonly KUBE_BUILD_SETCAP_IMAGE="${KUBE_BUILD_SETCAP_IMAGE:-$KUBE_BASE_IMAGE_REGISTRY/setcap:$__default_setcap_version}"

# Get the set of master binaries that run in Docker (on Linux)
# Entry format is "<binary-name>,<base-image>".
Expand Down
6 changes: 6 additions & 0 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ dependencies:
- path: test/utils/image/manifest.go
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+.\d+"}

- name: "k8s.gcr.io/setcap: dependents"
version: buster-v2.0.1
refPaths:
- path: build/common.sh
match: __default_setcap_version=

# metadata-concealment: bump this one first
- name: "metadata-concealment"
version: "1.6"
Expand Down

0 comments on commit c3d8507

Please sign in to comment.