From ea019ebb23d0720f188e6e682af41be97e635772 Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Wed, 8 Mar 2017 14:38:10 -0800 Subject: [PATCH] addon-manager: Create EnsureExists class addons before Reconcile class addons --- cluster/addons/addon-manager/kube-addons.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/addons/addon-manager/kube-addons.sh b/cluster/addons/addon-manager/kube-addons.sh index 008aa766282..361a49dd853 100755 --- a/cluster/addons/addon-manager/kube-addons.sh +++ b/cluster/addons/addon-manager/kube-addons.sh @@ -207,8 +207,8 @@ annotate_addons Deployment # The new Deployments will not fight for pods created by old RCs with the same label because the additional `pod-template-hash` label. # Apply will fail if some fields are modified but not are allowed, in that case should bump up addon version and name (e.g. handle externally). log INFO "== Executing apply to spin up new addon resources at $(date -Is) ==" -reconcile_addons false ensure_addons +reconcile_addons false # Wait for new addons to be spinned up before delete old resources log INFO "== Wait for addons to be spinned up at $(date -Is) ==" @@ -221,8 +221,8 @@ log INFO "== Entering periodical apply loop at $(date -Is) ==" while true; do start_sec=$(date +"%s") # Only print stderr for the readability of logging - reconcile_addons true ensure_addons + reconcile_addons true end_sec=$(date +"%s") len_sec=$((${end_sec}-${start_sec})) # subtract the time passed from the sleep time