Merge pull request kubernetes#23612 from mikedanese/addon-fix

Automatic merge from submit-queue use apply instead of create to setup namespaces and tokens in addon manager when the addon manager restarts, it takes ~15 minutes (1000 seconds) to start the sync loop because it retries creation of namespace and tokens 100 times. Create fails if the tokens already exist. Just use apply.
lavalamp · Apr 3, 2016 · 5be819b · 5be819b
2 parents 9ad3b9d + ffa8bbd
commit 5be819b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cluster/saltbase/salt/kube-addons/kube-addons.sh b/cluster/saltbase/salt/kube-addons/kube-addons.sh
@@ -59,7 +59,7 @@ function create-resource-from-string() {
   local -r config_name=$4;
   local -r namespace=$5;
   while [ ${tries} -gt 0 ]; do
-    echo "${config_string}" | ${KUBECTL} --namespace="${namespace}" create -f - && \
+    echo "${config_string}" | ${KUBECTL} --namespace="${namespace}" apply -f - && \
         echo "== Successfully started ${config_name} in namespace ${namespace} at $(date -Is)" && \
         return 0;
     let tries=tries-1;