github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to kube-addon-manager:v6.4-beta.2: new kubectl and base images

Browse Source
This commit is contained in:
Jeff Grafton 2017-06-12 19:28:23 -07:00
parent 208c25381f
commit eddf98d2c8
4 changed files with 8 additions and 4 deletions
Show Stats 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 6.4-beta.2 (Mon June 12 2017 Jeff Grafton <jgrafton@google.com>)
- Update kubectl to v1.6.4.
- Refresh base images.
### Version 6.4-beta.1 (Wed March 8 2017 Zihong Zheng <zihongz@google.com>) ### Version 6.4-beta.1 (Wed March 8 2017 Zihong Zheng <zihongz@google.com>)
- Create EnsureExists class addons before Reconcile class addons. - Create EnsureExists class addons before Reconcile class addons.

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

@ -15,8 +15,8 @@
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=v6.4-beta.1 VERSION=v6.4-beta.2
KUBECTL_VERSION?=v1.6.0-beta.2 KUBECTL_VERSION?=v1.6.4
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash

2
cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
View File

@ -13,7 +13,7 @@ spec:
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.1 image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.2
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:v6.4-beta.1 image: {{kube_docker_registry}}/kube-addon-manager:v6.4-beta.2
command: command:
- /bin/bash - /bin/bash
- -c - -c