Browse Source

Fix policy controller

'etcd_cert_dir' variable is missing from 'kubernetes-apps/ansible'
role which breaks Calico policy controller deployment.

Also fixing calico-policy-controller.yml.
pull/594/head
Aleksandr Didenko 8 years ago
parent
commit
251800eb16
2 changed files with 12 additions and 10 deletions
  1. 5
      roles/kubernetes-apps/ansible/defaults/main.yml
  2. 17
      roles/kubernetes-apps/ansible/templates/calico-policy-controller.yml.j2

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

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

@ -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:
- mountPath: {{ etcd_cert_dir }}
name: etcd-certs
readOnly: true
volumes:
- hostPath:
path: {{ etcd_cert_dir }}
name: etcd-certs
volumeMounts:
- mountPath: {{ etcd_cert_dir }}
name: etcd-certs
readOnly: true
volumes:
- hostPath:
path: {{ etcd_cert_dir }}
name: etcd-certs
Loading…
Cancel
Save