From 2c8e89820a8dc9734de3ab95dbaf7b462f223716 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Thu, 16 Feb 2017 11:17:17 -0800
Subject: [PATCH] Update kubectl in addon-manager to use HPA in autoscaling/v1
 instead of extensions/v1beta1

---
 cluster/addons/addon-manager/CHANGELOG.md                   | 3 +++
 cluster/addons/addon-manager/Makefile                       | 4 ++--
 .../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   | 3 ++-
 test/kubemark/resources/manifests/kube-addon-manager.yaml   | 6 +-----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md
index 7092d027fd5..2068f730cb5 100644
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Version 6.4-alpha.2 (Wed February 16 2017 Zihong Zheng <zihongz@google.com>)
+ - Update kubectl to v1.6.0-alpha.2 to use HPA in autoscaling/v1 instead of extensions/v1beta1.
+
 ### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng <zihongz@google.com>)
  - Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap.
 
diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index 73d757f7263..ad94806ca78 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.4-alpha.1
-KUBECTL_VERSION?=v1.6.0-alpha.1
+VERSION=v6.4-alpha.2
+KUBECTL_VERSION?=v1.6.0-alpha.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 0ab0b1d78ab..bd1b9dda206 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.4-alpha.1",
+        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.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 1c363f98098..a3eeffc0218 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.4-alpha.1",
+        "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.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 8fdaaf7723d..2710fbde44e 100644
--- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
+++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
@@ -12,7 +12,8 @@ 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.4-alpha.1
+    # - test/kubemark/resources/manifests/kube-addon-manager.yaml
+    image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.2
     command:
     - /bin/bash
     - -c
diff --git a/test/kubemark/resources/manifests/kube-addon-manager.yaml b/test/kubemark/resources/manifests/kube-addon-manager.yaml
index 3cb39590bad..764b75796d9 100644
--- a/test/kubemark/resources/manifests/kube-addon-manager.yaml
+++ b/test/kubemark/resources/manifests/kube-addon-manager.yaml
@@ -9,11 +9,7 @@ spec:
   hostNetwork: true
   containers:
   - name: kube-addon-manager
-    # 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
-    # - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
-    image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.1
+    image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.2
     command:
     - /bin/bash
     - -c