fix conflict

Signed-off-by: Tom <[email protected]>

hack/util.sh

@@ -267,7 +267,7 @@ function util::wait_pods() {
   lb=$2
   waittime=$3
   # Wait for the pods to be ready in the given namespace with label
-  while : ; do
+  while :; do
     res=$(kubectl wait --kubeconfig="$4" --context "$5" -n "${ns}" pod \
       -l "${lb}" --for=condition=Ready --timeout="${waittime}s" 2>/dev/null ||true)
     if [[ "${res}" == *"condition met"* ]]; then
@@ -340,7 +340,7 @@ metadata:
 EOF
 
   # Wait for the public IP address to become available.
-  while : ; do
+  while :; do
     ip=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.'${addrName}'}}{{end}}' "$2"-control-plane)
     if [[ -n "${ip}" ]]; then
       #Change the kubeconfig file not to use the loopback IP