Skip to content

K
k3s
Commit c956b5b4 authored by Matt Rickard's avatar Matt Rickard
Browse files
Options

Update kubectl in addon-manager to v1.5.0-alpha.1

`kubectl apply --prune` was only implemented in v1.5.1-alpha.1 (ea5ecc)
parent e2c5dea3
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 4 deletions
cluster/addons/addon-manager/Makefile
View file @ c956b5b4
...@@ -16,25 +16,22 @@ IMAGE=gcr.io/google-containers/kube-addon-manager ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment