Skip to content

Commit 516876b

Browse files
authored
Merge pull request kubernetes#68629 from shyamjvs/revert-67569-coredns-default
Revert "Enable CoreDNS as default for kube-up deployments"
2 parents 17fe91c + 73b014b commit 516876b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

cluster/gce/config-default.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ fi
259259

260260
# Optional: Install cluster DNS.
261261
# Set CLUSTER_DNS_CORE_DNS to 'true' to install CoreDNS instead of kube-dns.
262-
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-true}"
262+
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-false}"
263263
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
264264
DNS_SERVER_IP="${KUBE_DNS_SERVER_IP:-10.0.0.10}"
265265
DNS_DOMAIN="${KUBE_DNS_DOMAIN:-cluster.local}"

cluster/gce/config-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ fi
266266

267267
# Optional: Install cluster DNS.
268268
# Set CLUSTER_DNS_CORE_DNS to 'true' to install CoreDNS instead of kube-dns.
269-
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-true}"
269+
CLUSTER_DNS_CORE_DNS="${CLUSTER_DNS_CORE_DNS:-false}"
270270
ENABLE_CLUSTER_DNS="${KUBE_ENABLE_CLUSTER_DNS:-true}"
271271
DNS_SERVER_IP="10.0.0.10"
272272
DNS_DOMAIN="cluster.local"

cluster/gce/util.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ ENABLE_NODE_LOGGING: $(yaml-quote ${ENABLE_NODE_LOGGING:-false})
847847
LOGGING_DESTINATION: $(yaml-quote ${LOGGING_DESTINATION:-})
848848
ELASTICSEARCH_LOGGING_REPLICAS: $(yaml-quote ${ELASTICSEARCH_LOGGING_REPLICAS:-})
849849
ENABLE_CLUSTER_DNS: $(yaml-quote ${ENABLE_CLUSTER_DNS:-false})
850-
CLUSTER_DNS_CORE_DNS: $(yaml-quote ${CLUSTER_DNS_CORE_DNS:-true})
850+
CLUSTER_DNS_CORE_DNS: $(yaml-quote ${CLUSTER_DNS_CORE_DNS:-false})
851851
DNS_SERVER_IP: $(yaml-quote ${DNS_SERVER_IP:-})
852852
DNS_DOMAIN: $(yaml-quote ${DNS_DOMAIN:-})
853853
ENABLE_DNS_HORIZONTAL_AUTOSCALER: $(yaml-quote ${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-false})

0 commit comments

Comments
 (0)