From 134487191d37e314149fe0943b10a561c42eb526 Mon Sep 17 00:00:00 2001
From: Sandeep Rajan <srajan@infoblox.com>
Date: Wed, 15 Nov 2017 11:35:05 -0500
Subject: [PATCH] create fn for dns manifests

---
 cluster/addons/dns/coredns.yaml.base          |  6 ++
 cluster/addons/dns/coredns.yaml.in            |  6 ++
 cluster/addons/dns/coredns.yaml.sed           |  6 ++
 .../gce/container-linux/configure-helper.sh   | 57 +++++++++++--------
 cluster/gce/gci/configure-helper.sh           | 57 +++++++++++--------
 5 files changed, 84 insertions(+), 48 deletions(-)

diff --git a/cluster/addons/dns/coredns.yaml.base b/cluster/addons/dns/coredns.yaml.base
index 5f2de11d915..4976ac09a6f 100644
--- a/cluster/addons/dns/coredns.yaml.base
+++ b/cluster/addons/dns/coredns.yaml.base
@@ -95,6 +95,12 @@ spec:
       - name: coredns
         image: coredns/coredns:0.9.10
         imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 170Mi
+          requests:
+            cpu: 100m
+            memory: 70Mi
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts:
         - name: config-volume
diff --git a/cluster/addons/dns/coredns.yaml.in b/cluster/addons/dns/coredns.yaml.in
index c0cb9628ccf..d2eb1b35796 100644
--- a/cluster/addons/dns/coredns.yaml.in
+++ b/cluster/addons/dns/coredns.yaml.in
@@ -95,6 +95,12 @@ spec:
       - name: coredns
         image: coredns/coredns:0.9.10
         imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 170Mi
+          requests:
+            cpu: 100m
+            memory: 70Mi
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts:
         - name: config-volume
diff --git a/cluster/addons/dns/coredns.yaml.sed b/cluster/addons/dns/coredns.yaml.sed
index eca384b3ac3..329ad6ca23f 100644
--- a/cluster/addons/dns/coredns.yaml.sed
+++ b/cluster/addons/dns/coredns.yaml.sed
@@ -95,6 +95,12 @@ spec:
       - name: coredns
         image: coredns/coredns:0.9.10
         imagePullPolicy: IfNotPresent
+        resources:
+          limits:
+            memory: 170Mi
+          requests:
+            cpu: 100m
+            memory: 70Mi
         args: [ "-conf", "/etc/coredns/Corefile" ]
         volumeMounts:
         - name: config-volume
diff --git a/cluster/gce/container-linux/configure-helper.sh b/cluster/gce/container-linux/configure-helper.sh
index 03f49994a06..8daea4d0864 100755
--- a/cluster/gce/container-linux/configure-helper.sh
+++ b/cluster/gce/container-linux/configure-helper.sh
@@ -1228,6 +1228,36 @@ function update-prometheus-to-sd-parameters {
   fi
 }
 
+# Prepares the manifests of coreDNS for k8s addons.
+function setup-coredns-manifest {
+  local -r coredns_file="${dst_dir}/dns/coredns.yaml"
+      mv "${dst_dir}/dns/coredns.yaml.in" "${coredns_file}"
+      # Replace the salt configurations with variable values.
+      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
+      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
+      sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
+}
+
+# Prepares the manifests of kube-dns for k8s addons.
+function setup-kube-dns-manifest {
+  local -r kubedns_file="${dst_dir}/dns/kube-dns.yaml"
+      mv "${dst_dir}/dns/kube-dns.yaml.in" "${kubedns_file}"
+      if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
+        # Replace with custom GKE kube-dns deployment.
+        cat > "${kubedns_file}" <<EOF
+$(echo "$CUSTOM_KUBE_DNS_YAML")
+EOF
+        update-prometheus-to-sd-parameters ${kubedns_file}
+      fi
+      # Replace the salt configurations with variable values.
+      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
+      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
+
+      if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
+        setup-addon-manifests "addons" "dns-horizontal-autoscaler"
+      fi
+}
+
 # Prepares the manifests of k8s addons, and starts the addon manager.
 # Vars assumed:
 #   CLUSTER_NAME
@@ -1293,32 +1323,11 @@ EOF
     setup-addon-manifests "addons" "metrics-server"
   fi
   if [[ "${ENABLE_CLUSTER_DNS:-}" == "true" ]]; then
+    setup-addon-manifests "addons" "dns"
     if [[ "${CLUSTER_DNS_CORE_DNS:-}" == "true" ]]; then
-      setup-addon-manifests "addons" "dns"
-      local -r coredns_file="${dst_dir}/dns/coredns.yaml"
-      mv "${dst_dir}/dns/coredns.yaml.in" "${coredns_file}"
-      # Replace the salt configurations with variable values.
-      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
-      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
-      sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
+      setup-coredns-manifest
     else
-      setup-addon-manifests "addons" "dns"
-      local -r kubedns_file="${dst_dir}/dns/kube-dns.yaml"
-      mv "${dst_dir}/dns/kube-dns.yaml.in" "${kubedns_file}"
-      if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
-        # Replace with custom GKE kube-dns deployment.
-        cat > "${kubedns_file}" <<EOF
-$(echo "$CUSTOM_KUBE_DNS_YAML")
-EOF
-        update-prometheus-to-sd-parameters ${kubedns_file}
-      fi
-      # Replace the salt configurations with variable values.
-      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
-      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
-
-      if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
-        setup-addon-manifests "addons" "dns-horizontal-autoscaler"
-      fi
+      setup-kube-dns-manifest
     fi
   fi
   if [[ "${ENABLE_CLUSTER_REGISTRY:-}" == "true" ]]; then
diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index 1aaaa65be4a..cca297f22f7 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1762,6 +1762,36 @@ function update-prometheus-to-sd-parameters {
    fi
 }
 
+# Sets up the manifests of coreDNS for k8s addons.
+function setup-coredns-manifest {
+  local -r coredns_file="${dst_dir}/dns/coredns.yaml"
+      mv "${dst_dir}/dns/coredns.yaml.in" "${coredns_file}"
+      # Replace the salt configurations with variable values.
+      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
+      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
+      sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
+}
+
+# Sets up the manifests of kube-dns for k8s addons.
+function setup-kube-dns-manifest {
+  local -r kubedns_file="${dst_dir}/dns/kube-dns.yaml"
+      mv "${dst_dir}/dns/kube-dns.yaml.in" "${kubedns_file}"
+      if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
+        # Replace with custom GKE kube-dns deployment.
+        cat > "${kubedns_file}" <<EOF
+$(echo "$CUSTOM_KUBE_DNS_YAML")
+EOF
+        update-prometheus-to-sd-parameters ${kubedns_file}
+      fi
+      # Replace the salt configurations with variable values.
+      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
+      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
+
+      if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
+        setup-addon-manifests "addons" "dns-horizontal-autoscaler"
+      fi
+}
+
 # Prepares the manifests of k8s addons, and starts the addon manager.
 # Vars assumed:
 #   CLUSTER_NAME
@@ -1837,32 +1867,11 @@ EOF
     setup-addon-manifests "addons" "metrics-server"
   fi
   if [[ "${ENABLE_CLUSTER_DNS:-}" == "true" ]]; then
+    setup-addon-manifests "addons" "dns"
     if [[ "${CLUSTER_DNS_CORE_DNS:-}" == "true" ]]; then
-      setup-addon-manifests "addons" "dns"
-      local -r coredns_file="${dst_dir}/dns/coredns.yaml"
-      mv "${dst_dir}/dns/coredns.yaml.in" "${coredns_file}"
-      # Replace the salt configurations with variable values.
-      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${coredns_file}"
-      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${coredns_file}"
-      sed -i -e "s@{{ *pillar\['service_cluster_ip_range'\] *}}@${SERVICE_CLUSTER_IP_RANGE}@g" "${coredns_file}"
+      setup-coredns-manifest
     else
-      setup-addon-manifests "addons" "dns"
-      local -r kubedns_file="${dst_dir}/dns/kube-dns.yaml"
-      mv "${dst_dir}/dns/kube-dns.yaml.in" "${kubedns_file}"
-      if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
-        # Replace with custom GKE kube-dns deployment.
-        cat > "${kubedns_file}" <<EOF
-$(echo "$CUSTOM_KUBE_DNS_YAML")
-EOF
-        update-prometheus-to-sd-parameters ${kubedns_file}
-      fi
-      # Replace the salt configurations with variable values.
-      sed -i -e "s@{{ *pillar\['dns_domain'\] *}}@${DNS_DOMAIN}@g" "${kubedns_file}"
-      sed -i -e "s@{{ *pillar\['dns_server'\] *}}@${DNS_SERVER_IP}@g" "${kubedns_file}"
-
-      if [[ "${ENABLE_DNS_HORIZONTAL_AUTOSCALER:-}" == "true" ]]; then
-        setup-addon-manifests "addons" "dns-horizontal-autoscaler"
-      fi
+      setup-kube-dns-manifest
     fi
   fi
   if [[ "${ENABLE_CLUSTER_REGISTRY:-}" == "true" ]]; then