From efee982582a2192fd3c8adb18dcbbf6ae6b34f4c Mon Sep 17 00:00:00 2001
From: Jing Ai <jinga@google.com>
Date: Tue, 3 Jul 2018 23:28:47 -0700
Subject: [PATCH 1/2] Remove echo cmd when overwriting a file from an Env var.

---
 cluster/gce/gci/configure-helper.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index f726c36d96..d0176eff1f 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -2252,7 +2252,7 @@ function setup-kube-dns-manifest {
   if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
     # Replace with custom GKE kube-dns deployment.
     cat > "${kubedns_file}" <<EOF
-$(echo "$CUSTOM_KUBE_DNS_YAML")
+$CUSTOM_KUBE_DNS_YAML
 EOF
     update-prometheus-to-sd-parameters ${kubedns_file}
   fi
@@ -2275,7 +2275,7 @@ function setup-netd-manifest {
   if [ -n "${CUSTOM_NETD_YAML:-}" ]; then
     # Replace with custom GCP netd deployment.
     cat > "${netd_file}" <<EOF
-$(echo "$CUSTOM_NETD_YAML")
+$CUSTOM_NETD_YAML
 EOF
   fi
 }
@@ -2323,7 +2323,7 @@ function start-kube-addons {
     if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
       # Replace with custom GKE kube proxy.
       cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
-$(echo "$CUSTOM_KUBE_PROXY_YAML")
+$CUSTOM_KUBE_PROXY_YAML
 EOF
       update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml"
     fi

From 0ef45b4fcf7697ea94b96d1a2fe1d9bffb692f3a Mon Sep 17 00:00:00 2001
From: Jing Ai <jinga@google.com>
Date: Tue, 3 Jul 2018 23:42:20 -0700
Subject: [PATCH 2/2] Remove unnecessary spaces ahead of custom yaml.

---
 cluster/gce/gci/configure-helper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/gce/gci/configure-helper.sh b/cluster/gce/gci/configure-helper.sh
index d0176eff1f..1330b3edfd 100644
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -2292,7 +2292,7 @@ function setup-addon-custom-yaml {
   if [ -n "${custom_yaml:-}" ]; then
     # Replace with custom manifest.
     cat > "${manifest_path}" <<EOF
-    $custom_yaml
+$custom_yaml
 EOF
   fi
 }