From 47275cb6cdbfe3c8f45aa611ee8ba793c0cfb258 Mon Sep 17 00:00:00 2001 From: Harsh Singh Date: Thu, 11 Apr 2019 13:18:47 +0530 Subject: [PATCH] Fix for #75567 --- cluster/addons/addon-manager/Dockerfile | 1 - cluster/addons/addon-manager/README.md | 3 --- cluster/addons/addon-manager/kube-addons.sh | 3 --- cluster/addons/addon-manager/namespace.yaml | 4 ---- 4 files changed, 11 deletions(-) delete mode 100644 cluster/addons/addon-manager/namespace.yaml diff --git a/cluster/addons/addon-manager/Dockerfile b/cluster/addons/addon-manager/Dockerfile index 4555237dad4..e084f6578e2 100644 --- a/cluster/addons/addon-manager/Dockerfile +++ b/cluster/addons/addon-manager/Dockerfile @@ -17,7 +17,6 @@ FROM BASEIMAGE RUN clean-install bash ADD kube-addons.sh /opt/ -ADD namespace.yaml /opt/ ADD kubectl /usr/local/bin/ CMD ["/opt/kube-addons.sh"] diff --git a/cluster/addons/addon-manager/README.md b/cluster/addons/addon-manager/README.md index 3a69408b553..34a0bb45a25 100644 --- a/cluster/addons/addon-manager/README.md +++ b/cluster/addons/addon-manager/README.md @@ -22,9 +22,6 @@ have this label but without `addonmanager.kubernetes.io/mode=EnsureExists` will treated as "reconcile class addons" for now. - Resources under `$ADDON_PATH` need to have either one of these two labels. 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 -create them regardless during startup. #### How to release diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh index e0fbeb1781d..da100d4a416 100755 --- a/cluster/addons/addon-manager/kube-addons.sh +++ b/cluster/addons/addon-manager/kube-addons.sh @@ -210,9 +210,6 @@ function is_leader() { # managed result of that. Start everything below that directory. log INFO "== Kubernetes addon manager started at $(date -Is) with ADDON_CHECK_INTERVAL_SEC=${ADDON_CHECK_INTERVAL_SEC} ==" -# Create the namespace that will be used to host the cluster-level add-ons. -start_addon /opt/namespace.yaml 100 10 "" & - # Wait for the default service account to be created in the kube-system namespace. token_found="" while [ -z "${token_found}" ]; do diff --git a/cluster/addons/addon-manager/namespace.yaml b/cluster/addons/addon-manager/namespace.yaml deleted file mode 100644 index 986f4b48221..00000000000 --- a/cluster/addons/addon-manager/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: kube-system