github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Remove federation_domain_map entirely if it isn't set, seems to be not replaced by empty value.

Browse Source
This commit is contained in:
Madhusudan.C.S 2016-06-24 09:59:17 -07:00
parent f980aa2ae1
commit 3ee03a5584
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/common.sh
View File

@ -961,7 +961,11 @@ function kube::release::package_kube_manifests_tarball() {
fi fi
if [[ -n "${FEDERATIONS_DOMAIN_MAP}" ]]; then 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" 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 fi
else
sed -i '/{{ pillar\['"'"'federations_domain_map'"'"'\] }}/d' "${dst_dir}/dns/skydns-rc.yaml.in"
fi fi
# This is for coreos only. ContainerVM, GCI, or Trusty does not use it. # This is for coreos only. ContainerVM, GCI, or Trusty does not use it.