From a2a5dda47c2a614e5e18c971e1585c9da32564aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= <jiri.suchomel@suse.com>
Date: Wed, 13 Mar 2019 14:02:06 +0100
Subject: [PATCH] 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
---
 barbican/values.yaml   |  6 ++++++
 ceilometer/values.yaml | 14 ++++++++++++++
 cinder/values.yaml     | 12 ++++++++++++
 glance/values.yaml     |  6 ++++++
 heat/values.yaml       | 16 ++++++++++++++++
 horizon/values.yaml    |  6 ++++++
 ironic/values.yaml     |  6 ++++++
 keystone/values.yaml   | 20 ++++++++++++++++++++
 magnum/values.yaml     |  6 ++++++
 mistral/values.yaml    | 12 ++++++++++++
 neutron/values.yaml    | 18 ++++++++++++++++++
 nova/values.yaml       | 24 ++++++++++++++++++++++++
 rally/values.yaml      |  4 ++++
 senlin/values.yaml     | 10 ++++++++++
 14 files changed, 160 insertions(+)

diff --git a/barbican/values.yaml b/barbican/values.yaml
index 8e09fba0e3..82b0147623 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -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:
diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index fc3cce0fc7..e6ae7e3a17 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -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
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 7e77b5b573..2dcdb1bd46 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -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
diff --git a/glance/values.yaml b/glance/values.yaml
index 1069f61fa8..0b84216631 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -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
diff --git a/heat/values.yaml b/heat/values.yaml
index 3a2d1dc95e..d51f152300 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -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
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 45e6fb77f3..aaa14b0150 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -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:
diff --git a/ironic/values.yaml b/ironic/values.yaml
index 98cb463a5b..a3fc4b5c0b 100644
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@@ -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
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 4c2a1d6ee5..b2d6ed6813 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -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:
diff --git a/magnum/values.yaml b/magnum/values.yaml
index 04ea8399da..f40f193277 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -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
diff --git a/mistral/values.yaml b/mistral/values.yaml
index ee5d525b3e..0a3e6da0fd 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -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
diff --git a/neutron/values.yaml b/neutron/values.yaml
index 5b37ce4910..d1ab733f58 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -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:
diff --git a/nova/values.yaml b/nova/values.yaml
index 40582ebc46..b9be020d4b 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -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
diff --git a/rally/values.yaml b/rally/values.yaml
index 515e36bb3f..435da8ccaa 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -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:
diff --git a/senlin/values.yaml b/senlin/values.yaml
index 1f10a1b426..8ec3c54f26 100644
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@@ -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