airship
/
promenade
Code Issues Proposed changes

Correctly pass calico interface to calico chart 

Change-Id: I6d47438a7fcc8126d982b7671ada39ee2bc142b0
This commit is contained in:
Mark Burnett 2017-09-26 07:43:26 -05:00
parent 0d68e4c682
commit 299c02ebb2
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/etc/kubernetes/armada-loader/assets/charts/calico/values.yaml
View File

@ -1,4 +1,6 @@
calico:
# Interface used with IP_AUTODETECTION_METHOD=interface=...
interface: null
pod_ip_cidr: 10.97.0.0/16
etcd:
credentials:

3
promenade/templates/genesis/etc/kubernetes/armada-loader/assets/promenade-armada.yaml
View File

@ -40,6 +40,9 @@ data:
timeout: 600
values:
calico:
{%- if config['Network']['calico_interface'] is defined %}
interface: {{ config['Network']['calico_interface'] }}
{%- endif %}
etcd:
credentials:
ca: |-