Merge pull request #385 from openshift-cherrypick-robot/cherry-pick-3…

…55-to-release-4.12 [release-4.12] OCPBUGS-19933: update-node-resolver.sh: Check for errors from >>
openshift · Oct 10, 2023 · ffebbf4 · ffebbf4
2 parents d65d051 + b4a4521
commit ffebbf4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/assets/node-resolver/update-node-resolver.sh b/assets/node-resolver/update-node-resolver.sh
@@ -48,11 +48,17 @@ while true; do
     fi
 
     # Append resolver entries for services
+    rc=0
     for svc in "${!svc_ips[@]}"; do
       for ip in ${svc_ips[${svc}]}; do
-        echo "${ip} ${svc} ${svc}.${CLUSTER_DOMAIN} # ${OPENSHIFT_MARKER}" >> "${TEMP_FILE}"
+        echo "${ip} ${svc} ${svc}.${CLUSTER_DOMAIN} # ${OPENSHIFT_MARKER}" >> "${TEMP_FILE}" || rc=$?
       done
     done
+    if [[ $rc -ne 0 ]]; then
+      sleep 60 & wait
+      continue
+    fi
+
 
     # TODO: Update /etc/hosts atomically to avoid any inconsistent behavior
     # Replace /etc/hosts with our modified version if needed

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go