Address review comments.

2016-06-23 16:46:55 -07:00
parent c2e70a7c35
commit f980aa2ae1
3 changed files with 13 additions and 3 deletions
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
@@ -75,7 +75,6 @@ spec:
        # command = "/kube-dns"
        - --domain=$DNS_DOMAIN.
        - --dns-port=10053
-        $FEDERATIONS_DOMAIN_MAP
        ports:
        - containerPort: 10053
          name: dns-local
--- a/cluster/saltbase/salt/kube-dns/transforms2sed.sed
+++ b/cluster/saltbase/salt/kube-dns/transforms2sed.sed
@@ -1,5 +1,5 @@
 s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
 s/__PILLAR__DNS__REPLICAS__/$DNS_REPLICAS/g
 s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
-s/__PILLAR__FEDERATIONS__DOMAIN__MAP__/$FEDERATIONS_DOMAIN_MAP/g
+/__PILLAR__FEDERATIONS__DOMAIN__MAP__/d
 s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g