From 391ff02e4c8ecf946a5b22cd1caf522e8fcac55b Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Wed, 1 Jun 2016 12:53:34 +0200 Subject: [PATCH] Fix sed transformation for new kube-dns yaml --- cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed | 4 ++-- cluster/saltbase/salt/kube-dns/transforms2sed.sed | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed index 91c2113f36e..fc58a58d993 100644 --- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed +++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed @@ -73,7 +73,7 @@ spec: timeoutSeconds: 5 args: # command = "/kube-dns" - - --domain=$DNS_DOMAIN}}. + - --domain=$DNS_DOMAIN. - --dns-port=10053 ports: - containerPort: 10053 @@ -106,7 +106,7 @@ spec: cpu: 10m memory: 20Mi args: - - -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN}} 127.0.0.1 >/dev/null + - -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1 >/dev/null - -port=8080 ports: - containerPort: 8080 diff --git a/cluster/saltbase/salt/kube-dns/transforms2sed.sed b/cluster/saltbase/salt/kube-dns/transforms2sed.sed index c5627c612e8..612e467a958 100644 --- a/cluster/saltbase/salt/kube-dns/transforms2sed.sed +++ b/cluster/saltbase/salt/kube-dns/transforms2sed.sed @@ -1,4 +1,4 @@ s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g s/__PILLAR__DNS__REPLICAS__/$DNS_REPLICAS/g -s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN}}/g +s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g \ No newline at end of file