Merge "Make nodepool external_config mount more generic"
This commit is contained in:
commit
8ad92f242e
|
@ -38,16 +38,11 @@ spec:
|
||||||
- name: zookeeper-client-tls
|
- name: zookeeper-client-tls
|
||||||
mountPath: /tls/client
|
mountPath: /tls/client
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{%- if 'openstack' in external_config %}
|
{%- for name, c in external_config.items() %}
|
||||||
- name: openstack
|
- name: {{ name }}
|
||||||
mountPath: /etc/openstack
|
mountPath: /etc/{{ name }}
|
||||||
readOnly: true
|
readOnly: true
|
||||||
{%- endif %}
|
{%- endfor %}
|
||||||
{%- if 'kubernetes' in external_config %}
|
|
||||||
- name: kubernetes
|
|
||||||
mountPath: /etc/kubernetes
|
|
||||||
readOnly: true
|
|
||||||
{%- endif %}
|
|
||||||
volumes:
|
volumes:
|
||||||
- name: nodepool-config
|
- name: nodepool-config
|
||||||
secret:
|
secret:
|
||||||
|
@ -55,13 +50,8 @@ spec:
|
||||||
- name: zookeeper-client-tls
|
- name: zookeeper-client-tls
|
||||||
secret:
|
secret:
|
||||||
secretName: zookeeper-client-tls
|
secretName: zookeeper-client-tls
|
||||||
{%- if 'openstack' in external_config %}
|
{%- for name, c in external_config.items() %}
|
||||||
- name: openstack
|
- name: {{ name }}
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ external_config['openstack']['secretName'] }}
|
secretName: {{ c['secretName'] }}
|
||||||
{%- endif %}
|
{%- endfor %}
|
||||||
{%- if 'kubernetes' in external_config %}
|
|
||||||
- name: kubernetes
|
|
||||||
secret:
|
|
||||||
secretName: {{ external_config['kubernetes']['secretName'] }}
|
|
||||||
{%- endif %}
|
|
||||||
|
|
Loading…
Reference in New Issue