github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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 ea5ecc4145

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
This commit is contained in:
Kubernetes Submit Queue 2016-10-21 01:01:23 -07:00 committed by GitHub
commit 47743a5c6f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/addons/addon-manager/Makefile
View File

@ -16,25 +16,22 @@ IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v5.1 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 # 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 # however, arm64 and ppc64le are very experimental right now, so it's okay
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=python:2.7-slim BASEIMAGE?=python:2.7-slim
endif endif
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=hypriot/rpi-python:2.7 BASEIMAGE?=hypriot/rpi-python:2.7
QEMUARCH=arm QEMUARCH=arm
endif endif
ifeq ($(ARCH),arm64) ifeq ($(ARCH),arm64)
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=aarch64/python:2.7-slim BASEIMAGE?=aarch64/python:2.7-slim
QEMUARCH=aarch64 QEMUARCH=aarch64
endif endif
ifeq ($(ARCH),ppc64le) ifeq ($(ARCH),ppc64le)
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=ppc64le/python:2.7-slim BASEIMAGE?=ppc64le/python:2.7-slim
QEMUARCH=ppc64le QEMUARCH=ppc64le
endif endif