From c91d605124e2b47e12206c6947855b0b1a8fe387 Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Tue, 31 Jan 2017 16:42:24 -0800 Subject: [PATCH] Bumps addon-manager to v6.4-alpha.1 for supporting optional ConfigMap --- cluster/addons/addon-manager/CHANGELOG.md | 3 +++ cluster/addons/addon-manager/Makefile | 4 ++-- .../images/hyperkube/static-pods/addon-manager-multinode.json | 2 +- .../hyperkube/static-pods/addon-manager-singlenode.json | 2 +- cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md index d29def9671b..7092d027fd5 100644 --- a/cluster/addons/addon-manager/CHANGELOG.md +++ b/cluster/addons/addon-manager/CHANGELOG.md @@ -1,3 +1,6 @@ +### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng ) + - Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap. + ### Version 6.3 (Fri January 27 2017 Lucas Käldström ) - Updated the arm base image to `armhf/busybox` and now using qemu v2.7 for emulation. diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 5bd6f7d839d..73d757f7263 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -15,8 +15,8 @@ IMAGE=gcr.io/google-containers/kube-addon-manager ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -VERSION=v6.3 -KUBECTL_VERSION?=v1.5.2 +VERSION=v6.4-alpha.1 +KUBECTL_VERSION?=v1.6.0-alpha.1 ifeq ($(ARCH),amd64) BASEIMAGE?=bashell/alpine-bash diff --git a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json index 0d64875a6b0..0ab0b1d78ab 100644 --- a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json +++ b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json @@ -11,7 +11,7 @@ "containers": [ { "name": "kube-addon-manager", - "image": "REGISTRY/kube-addon-manager-ARCH:v6.2", + "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.1", "resources": { "requests": { "cpu": "5m", diff --git a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json index 2049d551353..1c363f98098 100644 --- a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json +++ b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json @@ -11,7 +11,7 @@ "containers": [ { "name": "kube-addon-manager", - "image": "REGISTRY/kube-addon-manager-ARCH:v6.2", + "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.1", "resources": { "requests": { "cpu": "5m", diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml index 642308f21e8..8fdaaf7723d 100644 --- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml +++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml @@ -12,7 +12,7 @@ spec: # When updating version also bump it in: # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json - image: gcr.io/google-containers/kube-addon-manager:v6.2 + image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1 command: - /bin/bash - -c