Merge pull request #76427 from hprateek43/Fix-#75567

Fix for #75567

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

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
 

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

cluster/addons/addon-manager/namespace.yaml

@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-system