Helm-Toolkit: Use image template for keystone and db management jobs

This PS moves to use the image template for keystone and db management jobs

Change-Id: Idf3e079714463fe94245733df0bf34d6427505ae
Signed-off-by: Pete Birley <pete@port.direct>

helm-toolkit/templates/manifests/_job-bootstrap.yaml

@@ -54,8 +54,7 @@ spec:
 {{ tuple $envAll "bootstrap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
       containers:
         - name: bootstrap
-          image: {{ $envAll.Values.images.tags.bootstrap }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{- if eq $openrc "true" }}
           env:

helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl

@@ -61,8 +61,7 @@ spec:
 {{- range $key1, $dbToDrop := $dbsToDrop }}
 {{ $dbToDropType := default "oslo" $dbToDrop.inputType }}
         - name: {{ printf "%s-%s-%d" $serviceNamePretty "db-drop" $key1 | quote }}
-          image: {{ $envAll.Values.images.tags.db_drop }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "db_drop" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION

helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl

@@ -58,8 +58,7 @@ spec:
 {{- range $key1, $dbToInit := $dbsToInit }}
 {{ $dbToInitType := default "oslo" $dbToInit.inputType }}
         - name: {{ printf "%s-%s-%d" $serviceNamePretty "db-init" $key1 | quote }}
-          image: {{ $envAll.Values.images.tags.db_init }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "db_init" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION

helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl

@@ -53,8 +53,7 @@ spec:
 {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: {{ printf "%s-%s" $serviceNamePretty "db-sync" | quote }}
-          image: {{ $dbToSync.image | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+{{ tuple $envAll $dbToSync.image | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
 {{- if $podEnvVars }}
           env:

helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl

@@ -50,8 +50,7 @@ spec:
 {{- range $key1, $osServiceType := $serviceTypes }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ printf "%s-%s-%s" $osServiceType "ks-endpoints" $osServiceEndPoint | quote }}
-          image: {{ $envAll.Values.images.tags.ks_endpoints }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "ks_endpoints" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh

helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl

@@ -49,8 +49,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := $serviceTypes }}
         - name: {{ printf "%s-%s" $osServiceType "ks-service-registration" | quote }}
-          image: {{ $envAll.Values.images.tags.ks_service }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "ks_service" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh

helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "ks_user" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ks-user
-          image: {{ $envAll.Values.images.tags.ks_user }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh

helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl

@@ -43,8 +43,7 @@ spec:
 {{ tuple $envAll "rabbit_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: rabbit-init
-          image: {{ $envAll.Values.images.tags.rabbit_init | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+{{ tuple $envAll "rabbit_init" | include "helm-toolkit.snippets.image" | indent 10 }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.rabbit_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/rabbit-init.sh