Automator: update common-files@master in istio/release-builder@master (…

…istio#1811)
jacob-delgado · Apr 8, 2024 · 2e5de17 · 2e5de17
1 parent ed625b6
commit 2e5de17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-0fb04a469bfc93ac7466cb401ee46c84d58cb23c
+79fdfc73f80957004f387ae8dae2cef2b6b6ab59
diff --git a/common/scripts/kind_provisioner.sh b/common/scripts/kind_provisioner.sh
@@ -172,14 +172,15 @@ function setup_kind_cluster() {
   if [[ -z "${CONFIG}" ]]; then
     # Kubernetes 1.15+
     CONFIG=${DEFAULT_CLUSTER_YAML}
-    # Configure the cluster IP Family only for default configs
-    if [ "${IP_FAMILY}" != "ipv4" ]; then
-      grep "ipFamily: ${IP_FAMILY}" "${CONFIG}" || \
-      cat <<EOF >> "${CONFIG}"
+  fi
+
+  # Configure the cluster IP Family if explicitly set
+  if [ "${IP_FAMILY}" != "ipv4" ]; then
+    grep "ipFamily: ${IP_FAMILY}" "${CONFIG}" || \
+    cat <<EOF >> "${CONFIG}"
 networking:
   ipFamily: ${IP_FAMILY}
 EOF
-    fi
   fi
 
   KIND_WAIT_FLAG="--wait=180s"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0fb04a469bfc93ac7466cb401ee46c84d58cb23c
		79fdfc73f80957004f387ae8dae2cef2b6b6ab59