mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-21 10:51:29 +00:00
Merge pull request #28024 from jszczepkowski/addon-mgr
Automatic merge from submit-queue Added PetSet support to addon manager. []() Added PetSet support to addon manager.
This commit is contained in:
commit
280c4c57a1
@ -15,26 +15,26 @@
|
|||||||
IMAGE=gcr.io/google-containers/kube-addon-manager
|
IMAGE=gcr.io/google-containers/kube-addon-manager
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
TEMP_DIR:=$(shell mktemp -d)
|
TEMP_DIR:=$(shell mktemp -d)
|
||||||
VERSION=v4
|
VERSION=v5
|
||||||
|
|
||||||
# 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.2.4
|
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.2.4
|
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.0
|
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-alpha.4
|
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
|
||||||
|
@ -477,6 +477,7 @@ function update-addons() {
|
|||||||
reconcile-objects ${addon_path} ReplicationController "-" &
|
reconcile-objects ${addon_path} ReplicationController "-" &
|
||||||
reconcile-objects ${addon_path} Deployment "-" &
|
reconcile-objects ${addon_path} Deployment "-" &
|
||||||
reconcile-objects ${addon_path} DaemonSet "-" &
|
reconcile-objects ${addon_path} DaemonSet "-" &
|
||||||
|
reconcile-objects ${addon_path} PetSet "-" &
|
||||||
|
|
||||||
# We don't expect names to be versioned for the following kinds, so
|
# We don't expect names to be versioned for the following kinds, so
|
||||||
# we match the entire name, ignoring version suffix.
|
# we match the entire name, ignoring version suffix.
|
||||||
|
Loading…
Reference in New Issue
Block a user