From 3ee03a558447a797ff79884feace17fb4d2a634f Mon Sep 17 00:00:00 2001
From: "Madhusudan.C.S" <madhusudancs@google.com>
Date: Fri, 24 Jun 2016 09:59:17 -0700
Subject: [PATCH] Remove federation_domain_map entirely if it isn't set, seems
 to be not replaced by empty value.

---
 build/common.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build/common.sh b/build/common.sh
index 9b6d361d442..1d0b17cfd9d 100755
--- a/build/common.sh
+++ b/build/common.sh
@@ -961,7 +961,11 @@ function kube::release::package_kube_manifests_tarball() {
     fi
     if [[ -n "${FEDERATIONS_DOMAIN_MAP}" ]]; then
       sed -i 's/{{ pillar\['"'"'federations_domain_map'"'"'\] }}/- --federations="'"${FEDERATIONS_DOMAIN_MAP}"'"/g' "${dst_dir}/dns/skydns-rc.yaml.in"
+    else
+      sed -i '/{{ pillar\['"'"'federations_domain_map'"'"'\] }}/d' "${dst_dir}/dns/skydns-rc.yaml.in"
     fi
+  else
+    sed -i '/{{ pillar\['"'"'federations_domain_map'"'"'\] }}/d' "${dst_dir}/dns/skydns-rc.yaml.in"
   fi
 
   # This is for coreos only. ContainerVM, GCI, or Trusty does not use it.