Merge pull request #35219 from r2d4/update-kubectl-addon-mgr

Automatic merge from submit-queue Update kubectl in addon-manager to v1.5.0-alpha.1 This updates the kubectl version that is vendored into the addon-manager image `kubectl apply --prune` is currently only implemented in v1.5.0-alpha.1 https://github.com/kubernetes/kubernetes/commit/ea5ecc414510320ac07437702f314bda012f55f6 The kube-addon-manager script will fail on kubectl versions that don't have this flag https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/addon-manager/kube-addons.sh#L154

Merge pull request #35219 from r2d4/update-kubectl-addon-mgr
47743a5c · Kubernetes Submit Queue · GitHub · c07c73ef · c956b5b4 · 47743a5c
Commit 47743a5c authored Oct 21, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

Makefile cluster/addons/addon-manager/Makefile +1 -4

No files found.
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -16,25 +16,22 @@ IMAGE=gcr.io/google-containers/kube-addon-manager
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
 VERSION=v5.1
+KUBECTL_VERSION?=v1.5.0-alpha.1

 # amd64 and arm has "stable" binaries pushed for v1.2, arm64 and ppc64le hasn't so they have to fetch the latest alpha
 # however, arm64 and ppc64le are very experimental right now, so it's okay
 ifeq ($(ARCH),amd64)
-	KUBECTL_VERSION?=v1.3.0-beta.2
 	BASEIMAGE?=python:2.7-slim
 endif
 ifeq ($(ARCH),arm)
-	KUBECTL_VERSION?=v1.3.0-beta.2
 	BASEIMAGE?=hypriot/rpi-python:2.7
 	QEMUARCH=arm
 endif
 ifeq ($(ARCH),arm64)
-	KUBECTL_VERSION?=v1.3.0-beta.2
 	BASEIMAGE?=aarch64/python:2.7-slim
 	QEMUARCH=aarch64
 endif
 ifeq ($(ARCH),ppc64le)
-	KUBECTL_VERSION?=v1.3.0-beta.2
 	BASEIMAGE?=ppc64le/python:2.7-slim
 	QEMUARCH=ppc64le
 endif