Merge pull request #4624 from thockin/dnslabels

Add cluster-service label to DNS
This commit is contained in:
Satnam Singh
2015-02-19 14:43:43 -08:00
2 changed files with 11 additions and 8 deletions

View File

@@ -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

View File

@@ -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