Use debian-iptables-$(ARCH):v12.0.1 and debian-base-$(ARCH):v2.0.0 co…

…ntainers debian-iptables container transparently select iptables-legacy or iptables-nft since v12.0.0: kubernetes/kubernetes#82966 While at it bump from debian-base from v1.0.0 to v2.0.0 Signed-off-by: Etienne Champetier <[email protected]>
kubernetes · Apr 10, 2020 · bc55a65 · bc55a65
1 parent 8749c2e
commit bc55a65
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/Dockerfile.node-cache b/Dockerfile.node-cache
@@ -13,10 +13,6 @@
 # limitations under the License.
 
 FROM ARG_FROM
-RUN apt-get update && apt-get install -y \
-    iproute2 \
-    iptables \
-&& rm -rf /var/lib/apt/lists/*
 ADD bin/ARG_ARCH/ARG_BIN /ARG_BIN
 EXPOSE 53 53/udp
 EXPOSE 53 53/tcp

diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile
@@ -27,25 +27,21 @@ OUTPUT_DIR := _output/$(ARCH)
 # Ensure that the docker command line supports the manifest images
 export DOCKER_CLI_EXPERIMENTAL=enabled
 
+BASEIMAGE ?= k8s.gcr.io/debian-base-$(ARCH):v2.0.0
 ifeq ($(ARCH),amd64)
-	BASEIMAGE ?= k8s.gcr.io/debian-base:v1.0.0
-	COMPILE_IMAGE := k8s.gcr.io/debian-base:v1.0.0
+	COMPILE_IMAGE := k8s.gcr.io/debian-base-$(ARCH):v2.0.0
 else ifeq ($(ARCH),arm)
-	BASEIMAGE ?= k8s.gcr.io/debian-base-arm:v1.0.0
 	TRIPLE    ?= arm-linux-gnueabihf
 	QEMUARCH  := arm
 else ifeq ($(ARCH),arm64)
-	BASEIMAGE ?= k8s.gcr.io/debian-base-arm64:v1.0.0
 	TRIPLE    ?= aarch64-linux-gnu
 	QEMUARCH  := aarch64
 else ifeq ($(ARCH),ppc64le)
-	BASEIMAGE ?= k8s.gcr.io/debian-base-ppc64le:v1.0.0
 	TRIPLE    ?= powerpc64le-linux-gnu
 	QEMUARCH  := ppc64le
 else ifeq ($(ARCH),s390x)
-        BASEIMAGE ?=k8s.gcr.io/debian-base-s390x:v1.0.0
-        TRIPLE    ?=s390x-linux-gnu
-        QEMUARCH  :=s390x
+	TRIPLE    ?= s390x-linux-gnu
+	QEMUARCH  := s390x
 else
 $(error Unsupported ARCH: $(ARCH))
 endif

diff --git a/rules.mk b/rules.mk
@@ -29,21 +29,10 @@ export VERSION
 SRC_DIRS := cmd pkg
 
 ALL_ARCH := amd64 arm arm64 ppc64le s390x
-# Set default base image dynamically for each arch
-ifeq ($(ARCH),amd64)
-	BASEIMAGE?=k8s.gcr.io/debian-base:v1.0.0
-endif
-ifeq ($(ARCH),arm)
-	BASEIMAGE?=k8s.gcr.io/debian-base-arm:v1.0.0
-endif
-ifeq ($(ARCH),arm64)
-	BASEIMAGE?=k8s.gcr.io/debian-base-arm64:v1.0.0
-endif
-ifeq ($(ARCH),ppc64le)
-	BASEIMAGE?=k8s.gcr.io/debian-base-ppc64le:v1.0.0
-endif
-ifeq ($(ARCH),s390x)
-	BASEIMAGE?=k8s.gcr.io/debian-base-s390x:v1.0.0
+ifeq ($(BINARY),node-cache)
+BASEIMAGE ?= k8s.gcr.io/debian-iptables-$(ARCH):v12.0.1
+else
+BASEIMAGE ?= k8s.gcr.io/debian-base-$(ARCH):v2.0.0
 endif
 
 # These rules MUST be expanded at reference time (hence '=') as BINARY