From 45179bb989ab7728c5ccf3e135148aa8193621f6 Mon Sep 17 00:00:00 2001
From: Benjamin Elder <bentheelder@google.com>
Date: Fri, 4 Jun 2021 01:03:55 -0700
Subject: [PATCH] update debian-iptables to v1.6.2
picks up https://github.com/kubernetes/release/pull/2106
---
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 9829a5ccaac03..2f9be9744886a 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -86,7 +86,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_debian_iptables_version=buster-v1.6.1
+readonly __default_debian_iptables_version=buster-v1.6.2
readonly __default_go_runner_version=v2.3.1-go1.16.4-buster.0
readonly __default_setcap_version=buster-v2.0.1
diff --git a/build/dependencies.yaml b/build/dependencies.yaml
index 64f940f93de8d..795f8507c8f49 100644
--- a/build/dependencies.yaml
+++ b/build/dependencies.yaml
@@ -144,7 +144,7 @@ dependencies:
match: BASEIMAGE\?\=k8s\.gcr\.io\/build-image\/debian-base-s390x:[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/debian-iptables: dependents"
- version: buster-v1.6.1
+ version: buster-v1.6.2
refPaths:
- path: build/common.sh
match: __default_debian_iptables_version=
diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go
index f9701aa9cceff..fa61bb0c50f25 100644
--- a/test/utils/image/manifest.go
+++ b/test/utils/image/manifest.go
@@ -214,7 +214,7 @@ func initImageConfigs(list RegistryList) (map[int]Config, map[int]Config) {
configs[CheckMetadataConcealment] = Config{list.PromoterE2eRegistry, "metadata-concealment", "1.6"}
configs[CudaVectorAdd] = Config{list.E2eRegistry, "cuda-vector-add", "1.0"}
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"}
- configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.1"}
+ configs[DebianIptables] = Config{list.BuildImageRegistry, "debian-iptables", "buster-v1.6.2"}
configs[EchoServer] = Config{list.PromoterE2eRegistry, "echoserver", "2.3"}
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.4.13-0"}
configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.0"}