From f62be637c81a4c4ce029534406ddfe65bdff92af Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Thu, 12 Jan 2017 13:49:13 -0800 Subject: [PATCH] Update kubectl to stable version for Addon Manager --- 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 275996df1db..cdae69b8184 100644 --- a/cluster/addons/addon-manager/CHANGELOG.md +++ b/cluster/addons/addon-manager/CHANGELOG.md @@ -1,3 +1,6 @@ +### Version 6.2 (Thu January 12 2017 Zihong Zheng ) + - Update kubectl to the stable version. + ### Version 6.1 (Tue November 29 2016 Zihong Zheng ) - Support pruning old Deployments. diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 288bbd631c4..4620741a4d4 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.1 -KUBECTL_VERSION?=v1.5.0-beta.2 +VERSION=v6.2 +KUBECTL_VERSION?=v1.5.2 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 48a5bc53c07..0d64875a6b0 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.1", + "image": "REGISTRY/kube-addon-manager-ARCH:v6.2", "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 e77c90ff422..2049d551353 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.1", + "image": "REGISTRY/kube-addon-manager-ARCH:v6.2", "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 542afdb9e5a..642308f21e8 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.1 + image: gcr.io/google-containers/kube-addon-manager:v6.2 command: - /bin/bash - -c