Skip to content

K
k3s
Commit 3ee03a55 authored by Madhusudan.C.S's avatar Madhusudan.C.S
Browse files
Options

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

parent f980aa2a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
build/common.sh
View file @ 3ee03a55
...@@ -961,7 +961,11 @@ function kube::release::package_kube_manifests_tarball() { ...@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment