From 555b9000c3f4c2dbb00bfc43d415069531406e65 Mon Sep 17 00:00:00 2001
From: Girish Kalele <gkalele@google.com>
Date: Tue, 31 May 2016 11:33:51 -0700
Subject: [PATCH] Code review comments and corrections

---
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base  | 4 +++-
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in    | 4 +++-
 cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed   | 4 +++-
 cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base | 2 ++
 cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in   | 2 ++
 cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed  | 2 ++
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
index e06e54cab33..e355feb88e7 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.base
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # __MACHINE_GENERATED_WARNING__
 
 apiVersion: v1
@@ -71,7 +73,7 @@ spec:
           timeoutSeconds: 5
         args:
         # command = "/kube-dns"
-        - --domain=__PILLAR__DNS__DOMAIN__
+        - --domain=__PILLAR__DNS__DOMAIN__.
         - --dns-port=10053
         ports:
         - containerPort: 10053
diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
index d29c1d89f81..0c8d45bdfc0 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
 
 apiVersion: v1
@@ -71,7 +73,7 @@ spec:
           timeoutSeconds: 5
         args:
         # command = "/kube-dns"
-        - --domain={{ pillar['dns_domain'] }}
+        - --domain={{ pillar['dns_domain'] }}.
         - --dns-port=10053
         ports:
         - containerPort: 10053
diff --git a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
index 455f2a9e177..91c2113f36e 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
+++ b/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-rc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # Warning: This is a file generated from the base underscore template file: skydns-rc.yaml.base
 
 apiVersion: v1
@@ -71,7 +73,7 @@ spec:
           timeoutSeconds: 5
         args:
         # command = "/kube-dns"
-        - --domain=$DNS_DOMAIN}}
+        - --domain=$DNS_DOMAIN}}.
         - --dns-port=10053
         ports:
         - containerPort: 10053
diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base
index ea7e634fc6d..fef2545df0d 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base
+++ b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.base
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # __MACHINE_GENERATED_WARNING__
 
 apiVersion: v1
diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
index 1abcf16da1a..93f9344b4da 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
+++ b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
 
 apiVersion: v1
diff --git a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed
index 95ffcffaf7c..7f4a9c2a00c 100644
--- a/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed
+++ b/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed
@@ -14,6 +14,8 @@
 
 # This file should be kept in sync with cluster/images/hyperkube/dns-svc.yaml
 
+# TODO - At some point, we need to rename all skydns-*.yaml.* files to kubedns-*.yaml.*
+
 # Warning: This is a file generated from the base underscore template file: skydns-svc.yaml.base
 
 apiVersion: v1