openstack/openstack-helm-infra
Code Issues Proposed changes

Moving job_rabbit_init from static to dynamic deps

Browse Source 
The patch moves dependency for job_rabbit_init from static to
dynamic section because of the fact that in some cases users and
credentials for OpenStack services had been created in RabbitMQ
before deployment of the OpepnStack chart for an service. Values is
going to have the below structure. cinder-rabbit-init could be moved
from static to dynamic section:

values:
  dependencies:
    dynamic:
      job_rabbit_init:
        api:
          jobs:
            - cinder-rabbit-init

Change-Id: Ib2b9858262a229390f775ad831f8c50dfb4a19da
This commit is contained in:
Oleh Hryhorov
2019-07-19 16:42:17 +03:00
committed by Chris Wedgwood
parent 25d03950b0
commit d82abf1375
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl
View File

@@ -148,6 +148,17 @@ Values:
{{- $_ := set $envAll.Values.__kubernetes_entrypoint_init_container "deps" ( index $envAll.Values.dependencies.static $component ) -}}
{{- end -}}
{{- end -}}
{{- if and ($envAll.Values.manifests.job_rabbit_init) (hasKey $envAll.Values.dependencies "dynamic") -}}
{{- if $envAll.Values.dependencies.dynamic.job_rabbit_init -}}
{{- if eq $component "pod_dependency" -}}
{{- $_ := include "helm-toolkit.utils.merge" ( tuple $envAll.Values.__kubernetes_entrypoint_init_container.deps ( index $envAll.Values.pod_dependency ) (index $envAll.Values.dependencies.dynamic.job_rabbit_init $component) ) -}}
{{- else -}}
{{- $_ := include "helm-toolkit.utils.merge" ( tuple $envAll.Values.__kubernetes_entrypoint_init_container.deps ( index $envAll.Values.dependencies.static $component ) (index $envAll.Values.dependencies.dynamic.job_rabbit_init $component)) -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $deps := $envAll.Values.__kubernetes_entrypoint_init_container.deps }}
{{- range $deps.custom_resources }}
{{- $_ := set . "namespace" $envAll.Release.Namespace -}}