Added volume related keys to pod mounts to ease the overriding

If user wants to add an extra volumeMounts/volume to a pod,
amd uses override values e.g. like this

pod:
  mounts:
    nova_placement:
      init_container: null
      nova_placement:
        volumeMounts:
          - name: nova-etc
          ...

helm template parser complains with

Warning: The destination item 'nova_placement' is a table and ignoring the source 'nova_placement' as it has a non-table value of: <nil>

So when we create empty values for such keys in values.yaml, the source
will be present and warning does not need to be shown.

Change-Id: Ib8dc53c3a54e12014025de8fafe16fbe9721c0da
This commit is contained in:
Jiří Suchomel 2019-03-13 14:02:06 +01:00 committed by Chris Wedgwood
parent 72bd0d597d
commit a2a5dda47c
14 changed files with 160 additions and 0 deletions

View File

@ -63,12 +63,18 @@ pod:
barbican_api:
init_container: null
barbican_api:
volumeMounts:
volumes:
barbican_bootstrap:
init_container: null
barbican_bootstrap:
volumeMounts:
volumes:
barbican_tests:
init_container: null
barbican_tests:
volumeMounts:
volumes:
replicas:
api: 1
lifecycle:

View File

@ -1834,24 +1834,38 @@ pod:
ceilometer_tests:
init_container: null
ceilometer_tests:
volumeMounts:
volumes:
ceilometer_api:
init_container: null
ceilometer_api:
volumeMounts:
volumes:
ceilometer_compute:
init_container: null
ceilometer_compute:
volumeMounts:
volumes:
ceilometer_central:
init_container: null
ceilometer_central:
volumeMounts:
volumes:
ceilometer_ipmi:
init_container: null
ceilometer_ipmi:
volumeMounts:
volumes:
ceilometer_collector:
init_container: null
ceilometer_collector:
volumeMounts:
volumes:
ceilometer_notification:
init_container: null
ceilometer_notification:
volumeMounts:
volumes:
replicas:
api: 1
central: 1

View File

@ -91,21 +91,33 @@ pod:
cinder_api:
init_container: null
cinder_api:
volumeMounts:
volumes:
cinder_scheduler:
init_container: null
cinder_scheduler:
volumeMounts:
volumes:
cinder_volume:
init_container: null
cinder_volume:
volumeMounts:
volumes:
cinder_volume_usage_audit:
init_container: null
cinder_volume_usage_audit:
volumeMounts:
volumes:
cinder_backup:
init_container: null
cinder_backup:
volumeMounts:
volumes:
cinder_tests:
init_container: null
cinder_tests:
volumeMounts:
volumes:
replicas:
api: 1
volume: 1

View File

@ -799,12 +799,18 @@ pod:
glance_api:
init_container: null
glance_api:
volumeMounts:
volumes:
glance_registry:
init_container: null
glance_registry:
volumeMounts:
volumes:
glance_tests:
init_container: null
glance_tests:
volumeMounts:
volumes:
replicas:
api: 1
registry: 1

View File

@ -967,27 +967,43 @@ pod:
heat_api:
init_container: null
heat_api:
volumeMounts:
volumes:
heat_cfn:
init_container: null
heat_cfn:
volumeMounts:
volumes:
heat_cloudwatch:
init_container: null
heat_cloudwatch:
volumeMounts:
volumes:
heat_engine:
init_container: null
heat_engine:
volumeMounts:
volumes:
heat_bootstrap:
init_container: null
heat_bootstrap:
volumeMounts:
volumes:
heat_trusts:
init_container: null
heat_trusts:
volumeMounts:
volumes:
heat_engine_cleaner:
init_container: null
heat_engine_cleaner:
volumeMounts:
volumes:
heat_tests:
init_container: null
heat_tests:
volumeMounts:
volumes:
replicas:
api: 1
cfn: 1

View File

@ -1991,12 +1991,18 @@ pod:
horizon_db_init:
init_container: null
horizon_db_init:
volumeMounts:
volumes:
horizon_db_sync:
init_container: null
horizon_db_sync:
volumeMounts:
volumes:
horizon:
init_container: null
horizon:
volumeMounts:
volumes:
replicas:
server: 1
lifecycle:

View File

@ -556,12 +556,18 @@ pod:
ironic_api:
init_container: null
ironic_api:
volumeMounts:
volumes:
ironic_conductor:
init_container: null
ironic_conductor:
volumeMounts:
volumes:
ironic_bootstrap:
init_container: null
ironic_bootstrap:
volumeMounts:
volumes:
replicas:
api: 1
conductor: 1

View File

@ -165,33 +165,53 @@ pod:
keystone_db_init:
init_container: null
keystone_db_init:
volumeMounts:
volumes:
keystone_db_sync:
init_container: null
keystone_db_sync:
volumeMounts:
volumes:
keystone_api:
init_container: null
keystone_api:
volumeMounts:
volumes:
keystone_tests:
init_container: null
keystone_tests:
volumeMounts:
volumes:
keystone_bootstrap:
init_container: null
keystone_bootstrap:
volumeMounts:
volumes:
keystone_fernet_setup:
init_container: null
keystone_fernet_setup:
volumeMounts:
volumes:
keystone_fernet_rotate:
init_container: null
keystone_fernet_rotate:
volumeMounts:
volumes:
keystone_credential_setup:
init_container: null
keystone_credential_setup:
volumeMounts:
volumes:
keystone_credential_rotate:
init_container: null
keystone_credential_rotate:
volumeMounts:
volumes:
keystone_domain_manage:
init_container: null
keystone_domain_manage:
volumeMounts:
volumes:
replicas:
api: 1
lifecycle:

View File

@ -492,12 +492,18 @@ pod:
magnum_api:
init_container: null
magnum_api:
volumeMounts:
volumes:
magnum_conductor:
init_container: null
magnum_conductor:
volumeMounts:
volumes:
magnum_bootstrap:
init_container: null
magnum_bootstrap:
volumeMounts:
volumes:
replicas:
api: 1
conductor: 1

View File

@ -541,21 +541,33 @@ pod:
mistral_api:
init_container: null
mistral_api:
volumeMounts:
volumes:
mistral_executor:
init_container: null
mistral_executor:
volumeMounts:
volumes:
mistral_engine:
init_container: null
mistral_engine:
volumeMounts:
volumes:
mistral_event_engine:
init_container: null
mistral_event_engine:
volumeMounts:
volumes:
mistral_bootstrap:
init_container: null
mistral_bootstrap:
volumeMounts:
volumes:
mistral_tests:
init_container: null
mistral_tests:
volumeMounts:
volumes:
replicas:
api: 1
engine: 1

View File

@ -313,30 +313,48 @@ pod:
neutron_server:
init_container: null
neutron_server:
volumeMounts:
volumes:
neutron_dhcp_agent:
init_container: null
neutron_dhcp_agent:
volumeMounts:
volumes:
neutron_l3_agent:
init_container: null
neutron_l3_agent:
volumeMounts:
volumes:
neutron_lb_agent:
init_container: null
neutron_lb_agent:
volumeMounts:
volumes:
neutron_metadata_agent:
init_container: null
neutron_metadata_agent:
volumeMounts:
volumes:
neutron_ovs_agent:
init_container: null
neutron_ovs_agent:
volumeMounts:
volumes:
neutron_sriov_agent:
init_container: null
neutron_sriov_agent:
volumeMounts:
volumes:
neutron_tests:
init_container: null
neutron_tests:
volumeMounts:
volumes:
neutron_bootstrap:
init_container: null
neutron_bootstrap:
volumeMounts:
volumes:
replicas:
server: 1
lifecycle:

View File

@ -1967,39 +1967,63 @@ pod:
nova_compute:
init_container: null
nova_compute:
volumeMounts:
volumes:
nova_compute_ironic:
init_container: null
nova_compute_ironic:
volumeMounts:
volumes:
nova_api_metadata:
init_container: null
nova_api_metadata:
volumeMounts:
volumes:
nova_placement:
init_container: null
nova_placement:
volumeMounts:
volumes:
nova_api_osapi:
init_container: null
nova_api_osapi:
volumeMounts:
volumes:
nova_consoleauth:
init_container: null
nova_consoleauth:
volumeMounts:
volumes:
nova_conductor:
init_container: null
nova_conductor:
volumeMounts:
volumes:
nova_scheduler:
init_container: null
nova_scheduler:
volumeMounts:
volumes:
nova_bootstrap:
init_container: null
nova_bootstrap:
volumeMounts:
volumes:
nova_tests:
init_container: null
nova_tests:
volumeMounts:
volumes:
nova_novncproxy:
init_novncproxy: null
nova_novncproxy:
volumeMounts:
volumes:
nova_spiceproxy:
init_spiceproxy: null
nova_spiceproxy:
volumeMounts:
volumes:
replicas:
api_metadata: 1
compute_ironic: 1

View File

@ -68,9 +68,13 @@ pod:
rally_api:
init_container: null
rally_api:
volumeMounts:
volumes:
rally_bootstrap:
init_container: null
rally_bootstrap:
volumeMounts:
volumes:
resources:
enabled: false
jobs:

View File

@ -511,18 +511,28 @@ pod:
senlin_api:
init_container: null
senlin_api:
volumeMounts:
volumes:
senlin_engine:
init_container: null
senlin_engine:
volumeMounts:
volumes:
senlin_bootstrap:
init_container: null
senlin_bootstrap:
volumeMounts:
volumes:
senlin_engine_cleaner:
init_container: null
senlin_engine_cleaner:
volumeMounts:
volumes:
senlin_tests:
init_container: null
senlin_tests:
volumeMounts:
volumes:
replicas:
api: 1
engine: 1