Skip to content

Commit 314264a

Browse files
authored
Merge pull request kubernetes#78010 from mikedanese/fixdns
cluster/gce: fix line 2414: DNS_MEMORY_LIMIT: unbound variable
2 parents 20d6b2f + 59f4661 commit 314264a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cluster/gce/gci/configure-helper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2377,7 +2377,7 @@ function setup-coredns-manifest {
23772377
sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
23782378
sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
23792379
sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
2380-
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT}@g" "${coredns_file}"
2380+
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT:-170Mi}@g" "${coredns_file}"
23812381

23822382
if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
23832383
setup-addon-manifests "addons" "dns-horizontal-autoscaler" "gce"
@@ -2429,7 +2429,7 @@ EOF
24292429
# Replace the salt configurations with variable values.
24302430
sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
24312431
sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
2432-
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT}@g" "${kubedns_file}"
2432+
sed -i -e "s@{{ *pillar\['dns_memory_limit'\] *}}@${DNS_MEMORY_LIMIT:-170Mi}@g" "${kubedns_file}"
24332433

24342434
if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
24352435
setup-addon-manifests "addons" "dns-horizontal-autoscaler" "gce"

0 commit comments

Comments
 (0)