Automator: update common-files@master in istio/istio.io@master (#11044)

This commit is contained in:
Istio Automation 2022-03-11 15:00:50 -08:00 committed by GitHub
parent 9d701e5bcd
commit 02a474d1c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -1 +1 @@
4ad508c01531a886e8aa12b4d0cd26ca9cfa6107
4f7a47a2619aa100ebdec34dc4a0369204c1c01c

View File

@ -170,11 +170,11 @@ function setup_kind_cluster() {
# Kubernetes 1.15+
CONFIG=${DEFAULT_CLUSTER_YAML}
# Configure the cluster IP Family only for default configs
if [ "${IP_FAMILY}" = "ipv6" ]; then
grep 'ipFamily: ipv6' "${CONFIG}" || \
if [ "${IP_FAMILY}" != "ipv4" ]; then
grep "ipFamily: ${IP_FAMILY}" "${CONFIG}" || \
cat <<EOF >> "${CONFIG}"
networking:
ipFamily: ipv6
ipFamily: ${IP_FAMILY}
EOF
fi
fi
@ -202,7 +202,7 @@ EOF
# https://github.com/coredns/coredns/issues/2494#issuecomment-457215452
# CoreDNS should handle those domains and answer with NXDOMAIN instead of SERVFAIL
# otherwise pods stops trying to resolve the domain.
if [ "${IP_FAMILY}" = "ipv6" ]; then
if [ "${IP_FAMILY}" = "ipv6" ] || [ "${IP_FAMILY}" = "dual" ]; then
# Get the current config
original_coredns=$(kubectl get -oyaml -n=kube-system configmap/coredns)
echo "Original CoreDNS config:"