From fcfe42068599180b0a52331df3c22bccfddf98aa Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Thu, 19 Feb 2015 14:15:02 -0800
Subject: [PATCH] Add cluster-service label to DNS

Also rename the rc, pod, and service, which I have meant to do for a long time.
---
 cluster/addons/dns/skydns-rc.yaml.in  | 12 +++++++-----
 cluster/addons/dns/skydns-svc.yaml.in |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cluster/addons/dns/skydns-rc.yaml.in b/cluster/addons/dns/skydns-rc.yaml.in
index 15c6d50623d..78926ead7d9 100644
--- a/cluster/addons/dns/skydns-rc.yaml.in
+++ b/cluster/addons/dns/skydns-rc.yaml.in
@@ -1,20 +1,22 @@
 kind: ReplicationController
 apiVersion: v1beta1
-id: skydns
+id: kube-dns
 namespace: default
 labels:
-  k8s-app: skydns
+  k8s-app: kube-dns
+  kubernetes.io/cluster-service: "true"
 desiredState:
   replicas: {{ pillar['dns_replicas'] }}
   replicaSelector:
-    k8s-app: skydns
+    k8s-app: kube-dns
   podTemplate:
     labels:
-      k8s-app: skydns
+      k8s-app: kube-dns
+      kubernetes.io/cluster-service: "true"
     desiredState:
       manifest:
         version: v1beta2
-        id: skydns
+        id: kube-dns
         dnsPolicy: "Default"  # Don't use cluster DNS.
         containers:
           - name: etcd
diff --git a/cluster/addons/dns/skydns-svc.yaml.in b/cluster/addons/dns/skydns-svc.yaml.in
index f94d414d5f3..943324ef6a1 100644
--- a/cluster/addons/dns/skydns-svc.yaml.in
+++ b/cluster/addons/dns/skydns-svc.yaml.in
@@ -1,12 +1,13 @@
 kind: Service
 apiVersion: v1beta1
-id: skydns
+id: kube-dns
 namespace: default
 protocol: UDP
 port: 53
 portalIP: {{ pillar['dns_server'] }}
 containerPort: 53
 labels:
-  k8s-app: skydns
+  k8s-app: kube-dns
+  kubernetes.io/cluster-service: "true"
 selector:
-  k8s-app: skydns
+  k8s-app: kube-dns