Merge pull request #67673 from javier-b-perez/debian-iptables

Automatic merge from submit-queue (batch tested with PRs 67298, 67518, 67635, 67673). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. build/debian-iptables: make: support arguments for base and tag **What this PR does / why we need it**: Change debian-iptables makefile to support arguments for base image and tag. **Special notes for your reviewer**: Tested locally. **Release note**: ```release-note None ```

Merge pull request #67673 from javier-b-perez/debian-iptables
09cdfc52 · Kubernetes Submit Queue · GitHub · ce8a6285 · 1b849f98 · 09cdfc52
Unverified Commit 09cdfc52 authored Aug 21, 2018 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Makefile build/debian-iptables/Makefile +2 -2

No files found.
--- a/build/debian-iptables/Makefile
+++ b/build/debian-iptables/Makefile
@@ -16,11 +16,11 @@

 REGISTRY?="staging-k8s.gcr.io"
 IMAGE=debian-iptables
-TAG=v10.1
+TAG?=v10.1
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)

-BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2
+BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.3.2

 build:
 	cp ./* $(TEMP_DIR)