Cleanups in DNS pod YAML.

This commit is contained in:
Tim Hockin 2015-05-05 17:30:01 -07:00
parent 7882d1eeb2
commit dfe81b7974

View File

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