Merge pull request #41587 from MrHohn/addon-manager-fix-hpa

Automatic merge from submit-queue (batch tested with PRs 41349, 41532, 41256, 41587, 41657) Update kubectl in addon-manager to use HPA in autoscaling/v1 Addon-manager is broken since HPA objects were removed from extensions api group. Came across the logs from [the latest addon-manager on Jenkins](https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-gci-gce/4290/artifacts/bootstrap-e2e-master/kube-addon-manager.log): ``` INFO: == Entering periodical apply loop at 2017-02-16T17:33:37+0000 == error: error pruning namespaced object extensions/v1beta1, Kind=HorizontalPodAutoscaler: the server could not find the requested resource WRN: == Failed to execute /usr/local/bin/kubectl apply --namespace=kube-system -f /etc/kubernetes/addons --prune=true -l kubernetes.io/cluster-service=true --recursive >/dev/null at 2017-02-16T17:33:38+0000. 2 tries remaining. == error: error pruning namespaced object extensions/v1beta1, Kind=HorizontalPodAutoscaler: the server could not find the requested resource WRN: == Failed to execute /usr/local/bin/kubectl apply --namespace=kube-system -f /etc/kubernetes/addons --prune=true -l kubernetes.io/cluster-service=true --recursive >/dev/null at 2017-02-16T17:33:46+0000. 1 tries remaining. == error: error pruning namespaced object extensions/v1beta1, Kind=HorizontalPodAutoscaler: the server could not find the requested resource WRN: == Failed to execute /usr/local/bin/kubectl apply --namespace=kube-system -f /etc/kubernetes/addons --prune=true -l kubernetes.io/cluster-service=true --recursive >/dev/null at 2017-02-16T17:33:53+0000. 0 tries remaining. == WRN: == Kubernetes addon update completed with errors at 2017-02-16T17:33:58+0000 == ``` And notice this commit (https://github.com/kubernetes/kubernetes/commit/f66679a4e902f2c6f0f1faa7204a5f2d4b1fc6fa) came in two weeks ago, which removed HorizontalPodAutoscaler from extensions/v1beta1. Addon-manager is now partially functioning that it could successfully create and update addons, but will fail to prune objects, which means upgrade tests may mostly fail. Pushed another version of addon-manager with kubectl v1.6.0-alpha.2 ([release 2 days ago](https://github.com/kubernetes/kubernetes/releases/tag/v1.6.0-alpha.2)) for fixing, including below images: - gcr.io/google-containers/kube-addon-manager:v6.4-alpha.2 - gcr.io/google-containers/kube-addon-manager-amd64:v6.4-alpha.2 - gcr.io/google-containers/kube-addon-manager-arm:v6.4-alpha.2 - gcr.io/google-containers/kube-addon-manager-arm64:v6.4-alpha.2 - gcr.io/google-containers/kube-addon-manager-ppc64le:v6.4-alpha.2 - gcr.io/google-containers/kube-addon-manager-s390x:v6.4-alpha.2 @mikedanese cc @wojtek-t @shyamjvs

Merge pull request #41587 from MrHohn/addon-manager-fix-hpa
fe34705f · Kubernetes Submit Queue · GitHub · b29bdee7 · 2c8e8982 · fe34705f
Commit fe34705f authored Feb 22, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 22, 2017
6 changed files
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
+### 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.

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

--- 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",

--- 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",

--- 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

--- 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:
+    image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.2
-    # - 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
    command:
    - /bin/bash
    - -c