Merge pull request #47389 from ixdy/kube-addon-manager-update

Automatic merge from submit-queue (batch tested with PRs 47302, 47389, 47402, 47468, 47459) Update to kube-addon-manager:v6.4-beta.2: kubectl v1.6.4 and refreshed base images **What this PR does / why we need it**: refreshes base images for kube-addon-manager with fixes for CVE-2016-9841 and CVE-2016-9843. x-ref https://github.com/kubernetes/kubernetes/issues/47386 **Special notes for your reviewer**: the updated images are not yet pushed, so tests will fail until that's done. **Release note**: ```release-note ``` /assign @MrHohn

Merge pull request #47389 from ixdy/kube-addon-manager-update
d8983699 · Kubernetes Submit Queue · GitHub · 4319f0fe · eddf98d2 · d8983699
Commit d8983699 authored Jun 13, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 13, 2017
4 changed files
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
+### 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>)
 - Create EnsureExists class addons before Reconcile class addons.

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

--- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
+++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
@@ -13,7 +13,7 @@ spec:
    # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
    # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
    # - 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:
    - /bin/bash
    - -c

--- a/test/kubemark/resources/manifests/kube-addon-manager.yaml
+++ b/test/kubemark/resources/manifests/kube-addon-manager.yaml
@@ -9,7 +9,7 @@ spec:
  hostNetwork: true
  containers:
  - 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:
    - /bin/bash
    - -c