From 677f740adf61f9c56d0719eacabfeae3b0787256 Mon Sep 17 00:00:00 2001
From: Zihong Zheng <zihongz@google.com>
Date: Tue, 20 Feb 2018 11:24:57 -0800
Subject: [PATCH] Bump addon-manager to v8.6

---
 cluster/addons/addon-manager/CHANGELOG.md                 | 4 ++++
 cluster/addons/addon-manager/Makefile                     | 4 ++--
 cluster/addons/addon-manager/README.md                    | 1 -
 cluster/addons/addon-manager/kube-addons.sh               | 2 +-
 cluster/gce/manifests/kube-addon-manager.yaml             | 2 +-
 test/kubemark/resources/manifests/kube-addon-manager.yaml | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/cluster/addons/addon-manager/CHANGELOG.md b/cluster/addons/addon-manager/CHANGELOG.md
index 39901846ec..c4be89753b 100644
--- a/cluster/addons/addon-manager/CHANGELOG.md
+++ b/cluster/addons/addon-manager/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Version 8.6  (Tue February 20 2018 Zihong Zheng <zihongz@google.com>)
+ - Allow reconcile/ensure loop to work with resource under non-kube-system namespace.
+ - Update kubectl to v1.9.3.
+
 ### Version 8.4  (Thu November 30 2017 zou nengren @zouyee)
  - Update kubectl to v1.8.4.
 
diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile
index bc653be93a..a58d02084b 100644
--- a/cluster/addons/addon-manager/Makefile
+++ b/cluster/addons/addon-manager/Makefile
@@ -15,8 +15,8 @@
 IMAGE=staging-k8s.gcr.io/kube-addon-manager
 ARCH?=amd64
 TEMP_DIR:=$(shell mktemp -d)
-VERSION=v8.5
-KUBECTL_VERSION?=v1.8.4
+VERSION=v8.6
+KUBECTL_VERSION?=v1.9.3
 
 ifeq ($(ARCH),amd64)
 	BASEIMAGE?=bashell/alpine-bash
diff --git a/cluster/addons/addon-manager/README.md b/cluster/addons/addon-manager/README.md
index 6dcdd1e67c..3a69408b55 100644
--- a/cluster/addons/addon-manager/README.md
+++ b/cluster/addons/addon-manager/README.md
@@ -21,7 +21,6 @@ In future release (after one year), Addon Manager may not respect it anymore. Ad
 have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will be
 treated as "reconcile class addons" for now.
 - Resources under `$ADDON_PATH` need to have either one of these two labels.
-Meanwhile namespaced resources need to be in `kube-system` namespace.
 Otherwise it will be omitted.
 - The above label and namespace rule does not stand for `/opt/namespace.yaml` and
 resources under `/etc/kubernetes/admission-controls/`. addon-manager will attempt to
diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh
index 49a809858f..f2002c3fbc 100755
--- a/cluster/addons/addon-manager/kube-addons.sh
+++ b/cluster/addons/addon-manager/kube-addons.sh
@@ -107,7 +107,7 @@ function create_resource_from_string() {
   local -r config_name=$4;
   local -r namespace=$5;
   while [ ${tries} -gt 0 ]; do
-    echo "${config_string}" | ${KUBECTL} ${KUBECTL_OPTS} apply -f - && \
+    echo "${config_string}" | ${KUBECTL} ${KUBECTL_OPTS} --namespace="${namespace}" apply -f - && \
       log INFO "== Successfully started ${config_name} in namespace ${namespace} at $(date -Is)" && \
       return 0;
     let tries=tries-1;
diff --git a/cluster/gce/manifests/kube-addon-manager.yaml b/cluster/gce/manifests/kube-addon-manager.yaml
index 0e852f62be..c77e914e67 100644
--- a/cluster/gce/manifests/kube-addon-manager.yaml
+++ b/cluster/gce/manifests/kube-addon-manager.yaml
@@ -13,7 +13,7 @@ spec:
   - name: kube-addon-manager
     # When updating version also bump it in:
     # - test/kubemark/resources/manifests/kube-addon-manager.yaml
-    image: k8s.gcr.io/kube-addon-manager:v8.5
+    image: k8s.gcr.io/kube-addon-manager:v8.6
     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 3c0f9bd0da..1ae5785c9c 100644
--- 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:v8.5
+    image: {{kube_docker_registry}}/kube-addon-manager:v8.6
     command:
     - /bin/bash
     - -c