C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #594 from adidenko/fix-calico-policy-controller

Browse source 
Fix policy controller
This commit is contained in:
Bogdan Dobrelya 2016-11-10 16:15:36 +01:00 committed by GitHub
commit 3aee431750
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
roles/kubernetes-apps/ansible/defaults/main.yml
View file

@ -9,4 +9,7 @@ kubedns_image_tag: "{{ kubedns_version }}"
kubednsmasq_image_repo: "gcr.io/google_containers/kube-dnsmasq-amd64" kubednsmasq_image_repo: "gcr.io/google_containers/kube-dnsmasq-amd64"
kubednsmasq_image_tag: "{{ kubednsmasq_version }}" kubednsmasq_image_tag: "{{ kubednsmasq_version }}"
exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64" exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64"
exechealthz_image_tag: "{{ exechealthz_version }}" exechealthz_image_tag: "{{ exechealthz_version }}"
# SSL
etcd_cert_dir: "/etc/ssl/etcd/ssl"

17
roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2
View file

@ -44,12 +44,11 @@ spec:
# This removes the need for KubeDNS to resolve the Service. # This removes the need for KubeDNS to resolve the Service.
- name: CONFIGURE_ETC_HOSTS - name: CONFIGURE_ETC_HOSTS
value: "true" value: "true"
volumeMounts: volumeMounts:
- mountPath: {{ etcd_cert_dir }} - mountPath: {{ etcd_cert_dir }}
name: etcd-certs name: etcd-certs
readOnly: true readOnly: true
volumes: volumes:
- hostPath: - hostPath:
path: {{ etcd_cert_dir }} path: {{ etcd_cert_dir }}
name: etcd-certs name: etcd-certs