diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index a725a6cd..7d63f4ad 100644 --- 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 index 7b9f3498..d4bc2a22 100644 --- 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 <> "${CONFIG}" + fi + + # Configure the cluster IP Family if explicitly set + if [ "${IP_FAMILY}" != "ipv4" ]; then + grep "ipFamily: ${IP_FAMILY}" "${CONFIG}" || \ + cat <> "${CONFIG}" networking: ipFamily: ${IP_FAMILY} EOF - fi fi KIND_WAIT_FLAG="--wait=180s"