scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump addon-manager to v8.6

Browse Source
This commit is contained in:
Zihong Zheng
2018-02-20 11:24:57 -08:00
parent a6b8c06380
commit 677f740adf
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/addon-manager/CHANGELOG.md
View File

@@ -1,3 +1,7 @@
### Version 8.6 (Tue February 20 2018 Zihong Zheng <zihongz@google.com>)
- Allow reconcile/ensure loop to work with resource under non-kube-system namespace.
- Update kubectl to v1.9.3.
### Version 8.4 (Thu November 30 2017 zou nengren @zouyee) ### Version 8.4 (Thu November 30 2017 zou nengren @zouyee)
- Update kubectl to v1.8.4. - Update kubectl to v1.8.4.

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

@@ -15,8 +15,8 @@
IMAGE=staging-k8s.gcr.io/kube-addon-manager IMAGE=staging-k8s.gcr.io/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v8.5 VERSION=v8.6
KUBECTL_VERSION?=v1.8.4 KUBECTL_VERSION?=v1.9.3
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash

1
cluster/addons/addon-manager/README.md
View File

@@ -21,7 +21,6 @@ In future release (after one year), Addon Manager may not respect it anymore. Ad
have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will be have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will be
treated as "reconcile class addons" for now. treated as "reconcile class addons" for now.
- Resources under `$ADDON_PATH` need to have either one of these two labels. - Resources under `$ADDON_PATH` need to have either one of these two labels.
Meanwhile namespaced resources need to be in `kube-system` namespace.
Otherwise it will be omitted. Otherwise it will be omitted.
- The above label and namespace rule does not stand for `/opt/namespace.yaml` and - The above label and namespace rule does not stand for `/opt/namespace.yaml` and
resources under `/etc/kubernetes/admission-controls/`. addon-manager will attempt to resources under `/etc/kubernetes/admission-controls/`. addon-manager will attempt to

2
cluster/addons/addon-manager/kube-addons.sh
View File

@@ -107,7 +107,7 @@ function create_resource_from_string() {
local -r config_name=$4; local -r config_name=$4;
local -r namespace=$5; local -r namespace=$5;
while [ ${tries} -gt 0 ]; do while [ ${tries} -gt 0 ]; do
echo "${config_string}" | ${KUBECTL} ${KUBECTL_OPTS} apply -f - && \ echo "${config_string}" | ${KUBECTL} ${KUBECTL_OPTS} --namespace="${namespace}" apply -f - && \
log INFO "== Successfully started ${config_name} in namespace ${namespace} at $(date -Is)" && \ log INFO "== Successfully started ${config_name} in namespace ${namespace} at $(date -Is)" && \
return 0; return 0;
let tries=tries-1; let tries=tries-1;

2
cluster/gce/manifests/kube-addon-manager.yaml
View File

@@ -13,7 +13,7 @@ spec:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in: # When updating version also bump it in:
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: k8s.gcr.io/kube-addon-manager:v8.5 image: k8s.gcr.io/kube-addon-manager:v8.6
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
test/kubemark/resources/manifests/kube-addon-manager.yaml
View File

@@ -9,7 +9,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
image: {{kube_docker_registry}}/kube-addon-manager:v8.5 image: {{kube_docker_registry}}/kube-addon-manager:v8.6
command: command:
- /bin/bash - /bin/bash
- -c - -c