github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #28024 from jszczepkowski/addon-mgr

Browse Source 
Automatic merge from submit-queue

Added PetSet support to addon manager.

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Added PetSet support to addon manager.
This commit is contained in:
k8s-merge-robot 2016-06-24 10:58:17 -07:00 committed by GitHub
commit 280c4c57a1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,26 +15,26 @@
IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64
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
# however, arm64 and ppc64le are very experimental right now, so it's okay
ifeq ($(ARCH),amd64)
KUBECTL_VERSION?=v1.2.4
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=python:2.7-slim
endif
ifeq ($(ARCH),arm)
KUBECTL_VERSION?=v1.2.4
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.0
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=aarch64/python:2.7-slim
QEMUARCH=aarch64
endif
ifeq ($(ARCH),ppc64le)
KUBECTL_VERSION?=v1.3.0-alpha.4
KUBECTL_VERSION?=v1.3.0-beta.2
BASEIMAGE?=ppc64le/python:2.7-slim
QEMUARCH=ppc64le
endif

1
cluster/addons/addon-manager/kube-addon-update.sh
View File

@ -477,6 +477,7 @@ function update-addons() {
reconcile-objects ${addon_path} ReplicationController "-" &
reconcile-objects ${addon_path} Deployment "-" &
reconcile-objects ${addon_path} DaemonSet "-" &
reconcile-objects ${addon_path} PetSet "-" &
# We don't expect names to be versioned for the following kinds, so
# we match the entire name, ignoring version suffix.