From dfe81b7974a75c0c2bedcefd741fdeb058a51063 Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Tue, 5 May 2015 17:30:01 -0700
Subject: [PATCH] Cleanups in DNS pod YAML.

---
 cluster/addons/dns/skydns-rc.yaml.in | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index cd726ebf009..f4bc5cf080c 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -1,11 +1,11 @@
 apiVersion: v1beta3
 kind: ReplicationController
 metadata:
+  name: kube-dns
+  namespace: default
   labels:
     k8s-app: kube-dns
     kubernetes.io/cluster-service: "true"
-  name: kube-dns
-  namespace: default
 spec:
   replicas: {{ pillar['dns_replicas'] }}
   selector:
@@ -15,7 +15,6 @@ spec:
       labels:
         k8s-app: kube-dns
         kubernetes.io/cluster-service: "true"
-        name: kube-dns
     spec:
       containers:
       - name: etcd
@@ -31,7 +30,7 @@ spec:
       - name: kube2sky
         image: gcr.io/google_containers/kube2sky:1.4
         args:
-        # entrypoint = "/kube2sky"
+        # command = "/kube2sky"
         - -domain={{ pillar['dns_domain'] }}
         - -kubecfg_file=/etc/dns_token/kubeconfig
         volumeMounts:
@@ -41,7 +40,7 @@ spec:
       - name: skydns
         image: gcr.io/google_containers/skydns:2015-03-11-001
         args:
-        # entrypoint = "/skydns"
+        # command = "/skydns"
         - -machines=http://localhost:4001
         - -addr=0.0.0.0:53
         - -domain={{ pillar['dns_domain'] }}.