Merge "Rafactoring volume mount variables in db sync job"

2019-06-18 18:24:18 +00:00 · 2019-06-18 18:24:18 +00:00 · cd460f12c2
commit cd460f12c2
parent 89f5bfe3ac 0ea9be7ade
28 changed files with 77 additions and 15 deletions
--- a/aodh/templates/job-db-sync.yaml
+++ b/aodh/templates/job-db-sync.yaml
@ -16,5 +16,6 @@ limitations under the License.

 {{- if .Values.manifests.job_db_sync }}
 {{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "aodh" "podVolMounts" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumeMounts "podVols" .Values.pod.mounts.aodh_db_sync.aodh_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/aodh/values.yaml
+++ b/aodh/values.yaml
@ -133,6 +133,10 @@ pod:
      aodh_tests:
        volumeMounts:
        volumes:
+    aodh_db_sync:
+      aodh_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    evaluator: 1
--- a/barbican/templates/job-db-sync.yaml
+++ b/barbican/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "barbican" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "barbican" "podVolMounts" .Values.pod.mounts.barbican_db_sync.barbican_db_sync.volumeMounts "podVols" .Values.pod.mounts.barbican_db_sync.barbican_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@ -82,6 +82,10 @@ pod:
      barbican_tests:
        volumeMounts:
        volumes:
+    barbican_db_sync:
+      barbican_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
  lifecycle:
--- a/ceilometer/templates/job-db-sync.yaml
+++ b/ceilometer/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "ceilometer" "podVolMounts" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumeMounts "podVols" .Values.pod.mounts.ceilometer_db_sync.ceilometer_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@ -1956,6 +1956,10 @@ pod:
      ceilometer_notification:
        volumeMounts:
        volumes:
+    ceilometer_db_sync:
+      ceilometer_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    central: 1
--- a/cinder/templates/job-db-sync.yaml
+++ b/cinder/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "cinder" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "cinder" "podVolMounts" .Values.pod.mounts.cinder_db_sync.cinder_db_sync.volumeMounts "podVols" .Values.pod.mounts.cinder_db_sync.cinder_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@ -134,6 +134,10 @@ pod:
      cinder_tests:
        volumeMounts:
        volumes:
+    cinder_db_sync:
+      cinder_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    volume: 1
--- a/congress/templates/job-db-sync.yaml
+++ b/congress/templates/job-db-sync.yaml
@ -16,5 +16,6 @@ limitations under the License.

 {{- if .Values.manifests.job_db_sync }}
 {{- $dbSyncJob := dict "envAll" . "serviceName" "congress" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "congress" "podVolMounts" .Values.pod.mounts.congress_db_sync.congress_db_sync.volumeMounts "podVols" .Values.pod.mounts.congress_db_sync.congress_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/congress/values.yaml
+++ b/congress/values.yaml
@ -477,6 +477,11 @@ pod:
        default: kubernetes.io/hostname
      weight:
        default: 10
+  mounts:
+    congress_db_sync:
+      congress_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    policy_engine: 1
--- a/glance/templates/job-db-sync.yaml
+++ b/glance/templates/job-db-sync.yaml
@ -15,8 +15,8 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $serviceName := "glance" -}}
-{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" $serviceName "glance-api" ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "image" ( index .Values.images.tags ( printf "%s_db_sync" $serviceName )) ) -}}
-{{- $dbSyncJob := dict "envAll" . "serviceName" $serviceName "dbToSync" $dbToSync -}}
+{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" "glance" "glance-api" ) "logConfigFile" (printf "/etc/%s/logging.conf" "glance" ) "image" ( index .Values.images.tags ( printf "%s_db_sync" "glance" )) ) -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "glance" "podVolMounts" .Values.pod.mounts.glance_db_sync.glance_db_sync.volumeMounts "podVols" .Values.pod.mounts.glance_db_sync.glance_db_sync.volumes "dbToSync" $dbToSync -}}
+
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/glance/values.yaml
+++ b/glance/values.yaml
@ -845,6 +845,10 @@ pod:
      glance_tests:
        volumeMounts:
        volumes:
+    glance_db_sync:
+      glance_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    registry: 1
--- a/heat/templates/job-db-sync.yaml
+++ b/heat/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "heat" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "heat" "podVolMounts" .Values.pod.mounts.heat_db_sync.heat_db_sync.volumeMounts "podVols" .Values.pod.mounts.heat_db_sync.heat_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/heat/values.yaml
+++ b/heat/values.yaml
@ -1079,6 +1079,10 @@ pod:
      heat_tests:
        volumeMounts:
        volumes:
+    heat_db_sync:
+      heat_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    cfn: 1
--- a/ironic/templates/job-db-sync.yaml
+++ b/ironic/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "ironic" "podVolMounts" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumeMounts "podVols" .Values.pod.mounts.ironic_db_sync.ironic_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/ironic/values.yaml
+++ b/ironic/values.yaml
@ -581,6 +581,10 @@ pod:
      ironic_bootstrap:
        volumeMounts:
        volumes:
+    ironic_db_sync:
+      ironic_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    conductor: 1
--- a/magnum/templates/job-db-sync.yaml
+++ b/magnum/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "magnum" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "magnum" "podVolMounts" .Values.pod.mounts.magnum_db_sync.magnum_db_sync.volumeMounts "podVols" .Values.pod.mounts.magnum_db_sync.magnum_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@ -506,6 +506,10 @@ pod:
      magnum_bootstrap:
        volumeMounts:
        volumes:
+    magnum_db_sync:
+      magnum_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    conductor: 1
--- a/mistral/templates/job-db-sync.yaml
+++ b/mistral/templates/job-db-sync.yaml
@ -16,6 +16,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "mistral" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "mistral" "podVolMounts" .Values.pod.mounts.mistral_db_sync.mistral_db_sync.volumeMounts "podVols" .Values.pod.mounts.mistral_db_sync.mistral_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@ -570,6 +570,10 @@ pod:
      mistral_tests:
        volumeMounts:
        volumes:
+    mistral_db_sync:
+      mistral_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    engine: 1
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/templates/job-db-sync.yaml
@ -15,7 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $podVolMounts := list (dict "name" "db-sync-conf" "mountPath" "/etc/neutron/plugins/ml2/ml2_conf.ini" "subPath" "ml2_conf.ini" "readOnly" true )}}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "neutron" "podVolMounts" $podVolMounts -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "neutron" "podVolMounts" .Values.pod.mounts.neutron_db_sync.neutron_db_sync.volumeMounts "podVols" .Values.pod.mounts.neutron_db_sync.neutron_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@ -358,6 +358,14 @@ pod:
      neutron_bootstrap:
        volumeMounts:
        volumes:
+    neutron_db_sync:
+      neutron_db_sync:
+        volumeMounts:
+          - name: db-sync-conf
+            mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
+            subPath: ml2_conf.ini
+            readOnly: true
+        volumes:
  replicas:
    server: 1
  lifecycle:
--- a/nova/templates/job-db-sync.yaml
+++ b/nova/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "nova" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "nova" "podVolMounts" .Values.pod.mounts.nova_db_sync.nova_db_sync.volumeMounts "podVols" .Values.pod.mounts.nova_db_sync.nova_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/nova/values.yaml
+++ b/nova/values.yaml
@ -2262,6 +2262,10 @@ pod:
      nova_spiceproxy:
        volumeMounts:
        volumes:
+    nova_db_sync:
+      nova_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api_metadata: 1
    compute_ironic: 1
--- a/panko/templates/job-db-sync.yaml
+++ b/panko/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "panko" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "panko" "podVolMounts" .Values.pod.mounts.panko_db_sync.panko_db_sync.volumeMounts "podVols" .Values.pod.mounts.panko_db_sync.panko_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/panko/values.yaml
+++ b/panko/values.yaml
@ -480,6 +480,10 @@ pod:
      panko_tests:
        volumeMounts:
        volumes:
+    panko_db_sync:
+      panko_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
  lifecycle:
--- a/senlin/templates/job-db-sync.yaml
+++ b/senlin/templates/job-db-sync.yaml
@ -15,6 +15,6 @@ limitations under the License.
 */}}

 {{- if .Values.manifests.job_db_sync }}
-{{- $dbSyncJob := dict "envAll" . "serviceName" "senlin" -}}
+{{- $dbSyncJob := dict "envAll" . "serviceName" "senlin" "podVolMounts" .Values.pod.mounts.senlin_db_sync.senlin_db_sync.volumeMounts "podVols" .Values.pod.mounts.senlin_db_sync.senlin_db_sync.volumes -}}
 {{ $dbSyncJob | include "helm-toolkit.manifests.job_db_sync" }}
 {{- end }}
--- a/senlin/values.yaml
+++ b/senlin/values.yaml
@ -535,6 +535,10 @@ pod:
      senlin_tests:
        volumeMounts:
        volumes:
+    senlin_db_sync:
+      senlin_db_sync:
+        volumeMounts:
+        volumes:
  replicas:
    api: 1
    engine: 1