Making gcr.io/google_containers/k8s-dns-kube-dns-s390x images available.

bowei · Feb 15, 2017 · 6500567 · 6500567
1 parent 58ab33a
commit 6500567
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/images/dnsmasq/Makefile b/images/dnsmasq/Makefile
@@ -18,9 +18,9 @@ ARCH ?= amd64
 DNSMASQ_VERSION ?= dnsmasq-2.76
 CONTAINER_PREFIX ?= k8s-dns
 
-ALL_ARCH := amd64 arm arm64 ppc64le
+ALL_ARCH := amd64 arm arm64 ppc64le s390x
 IMAGE := $(CONTAINER_PREFIX)-dnsmasq-$(ARCH)
-COMPILE_IMAGE := gcr.io/google_containers/kube-cross:v1.6.2-2
+COMPILE_IMAGE := gcr.io/google_containers/kube-cross:v1.7.4-1
 OUTPUT_DIR := _output/$(ARCH)
 
 ifeq ($(ARCH),amd64)

diff --git a/rules.mk b/rules.mk
@@ -27,7 +27,7 @@ export VERSION
 # directories which hold app source (not vendored)
 SRC_DIRS := cmd pkg
 
-ALL_ARCH := amd64 arm arm64 ppc64le
+ALL_ARCH := amd64 arm arm64 ppc64le s390x
 # Set default base image dynamically for each arch
 ifeq ($(ARCH),amd64)
     BASEIMAGE?=alpine
@@ -45,6 +45,10 @@ ifeq ($(ARCH),ppc64le)
     BASEIMAGE?=ppc64le/busybox
     NOBODY?=nobody
 endif
+ifeq ($(ARCH),s390x)
+    BASEIMAGE?=s390x/busybox
+    NOBODY?=nobody
+endif
 
 # These rules MUST be expanded at reference time (hence '=') as BINARY
 # is dynamically scoped.