zuul
/
zuul-operator
Code Issues Proposed changes

Merge "Make nodepool external_config mount more generic"

This commit is contained in:
Zuul 2021-08-17 11:53:35 +00:00 committed by Gerrit Code Review
parent b977aa9e12 5c3eca7d7f
commit 8ad92f242e
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
zuul_operator/templates/nodepool-launcher.yaml
View File

@ -38,16 +38,11 @@ spec:
- name: zookeeper-client-tls
mountPath: /tls/client
readOnly: true
{%- if 'openstack' in external_config %}
- name: openstack
mountPath: /etc/openstack
{%- for name, c in external_config.items() %}
- name: {{ name }}
mountPath: /etc/{{ name }}
readOnly: true
{%- endif %}
{%- if 'kubernetes' in external_config %}
- name: kubernetes
mountPath: /etc/kubernetes
readOnly: true
{%- endif %}
{%- endfor %}
volumes:
- name: nodepool-config
secret:
@ -55,13 +50,8 @@ spec:
- name: zookeeper-client-tls
secret:
secretName: zookeeper-client-tls
{%- if 'openstack' in external_config %}
- name: openstack
{%- for name, c in external_config.items() %}
- name: {{ name }}
secret:
secretName: {{ external_config['openstack']['secretName'] }}
{%- endif %}
{%- if 'kubernetes' in external_config %}
- name: kubernetes
secret:
secretName: {{ external_config['kubernetes']['secretName'] }}
{%- endif %}
secretName: {{ c['secretName'] }}
{%- endfor %}