Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cluster-service label to DNS #4624

Merged
merged 1 commit into from
Feb 19, 2015
Merged

Add cluster-service label to DNS #4624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions cluster/addons/dns/skydns-rc.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions cluster/addons/dns/skydns-svc.yaml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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