fix: CSE file wait is idempotent (#2192)

Azure · Oct 22, 2019 · 15dd58c · 15dd58c
1 parent 5bfc45f
commit 15dd58c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/parts/k8s/cloud-init/artifacts/cse_helpers.sh b/parts/k8s/cloud-init/artifacts/cse_helpers.sh
@@ -137,6 +137,8 @@ retrycmd_get_executable() {
 }
 wait_for_file() {
     retries=$1; wait_sleep=$2; filepath=$3
+    paved=/opt/azure/cloud-init-files.paved
+    grep -Fq "${filepath}" $paved && return 0
     for i in $(seq 1 $retries); do
         grep -Fq '#EOF' $filepath && break
         if [ $i -eq $retries ]; then
@@ -146,6 +148,7 @@ wait_for_file() {
         fi
     done
     sed -i "/#EOF/d" $filepath
+    echo $filepath >> $paved
 }
 wait_for_apt_locks() {
     while fuser /var/lib/dpkg/lock /var/lib/apt/lists/lock /var/cache/apt/archives/lock >/dev/null 2>&1; do

diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go