From 7b0b87e057a80c86c4b810ab69f18087ece7e7f2 Mon Sep 17 00:00:00 2001 From: cpanato Date: Sun, 12 Mar 2023 15:23:55 +0100 Subject: [PATCH 1/2] Updated distroless iptables to use released image `registry.k8s.io/build-image/distroless-iptables:v0.2.2` Signed-off-by: cpanato --- build/common.sh | 2 +- build/dependencies.yaml | 2 +- test/utils/image/manifest.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/common.sh b/build/common.sh index 0c50ce60e06..b6c1dfcca94 100755 --- a/build/common.sh +++ b/build/common.sh @@ -95,7 +95,7 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}" readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. -readonly __default_distroless_iptables_version=v0.2.1 +readonly __default_distroless_iptables_version=v0.2.2 readonly __default_go_runner_version=v2.3.1-go1.20.2-bullseye.0 readonly __default_setcap_version=bullseye-v1.3.0 diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 8931e745e4e..1277bda44e7 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -139,7 +139,7 @@ dependencies: match: BASE_IMAGE_VERSION\?= - name: "registry.k8s.io/distroless-iptables: dependents" - version: v0.2.1 + version: v0.2.2 refPaths: - path: build/common.sh match: __default_distroless_iptables_version= diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 2b2e16428db..4d37e666bbc 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -245,7 +245,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-4"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} - configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.2.1"} + configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.2.2"} configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.7-0"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} From 609ae513952bb06c36593cbf3d0d89fe1a878959 Mon Sep 17 00:00:00 2001 From: cpanato Date: Sun, 12 Mar 2023 15:26:56 +0100 Subject: [PATCH 2/2] Updated setcap to use released image `registry.k8s.io/build-image/setcap:bullseye-v1.4.2` Signed-off-by: cpanato --- build/common.sh | 2 +- build/dependencies.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/common.sh b/build/common.sh index b6c1dfcca94..4022ce924b8 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,7 +97,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.2.2 readonly __default_go_runner_version=v2.3.1-go1.20.2-bullseye.0 -readonly __default_setcap_version=bullseye-v1.3.0 +readonly __default_setcap_version=bullseye-v1.4.2 # 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}" diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 1277bda44e7..c80306d5c5d 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -215,7 +215,7 @@ dependencies: match: configs\[Pause\] = Config{list\.GcRegistry, "pause", "\d+\.\d+(.\d+)?"} - name: "registry.k8s.io/setcap: dependents" - version: bullseye-v1.3.0 + version: bullseye-v1.4.2 refPaths: - path: build/common.sh match: __default_setcap_version=