Add image management function to manifests

When removing helm-toolkit from OSH and swithcing to use the
toolkit from OSH-Infra, the image declaration function was missed.

Depends-On: I2f2012590d81ffcb159d49d8a76eedd4441744cd
Change-Id: I0f1118bb748f3fe1b6bb73acfc00e77c5cca9c7d
Signed-off-by: Pete Birley <pete@port.direct>

barbican/templates/deployment-api.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "api" $mounts_barbican_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: barbican-api
-          image: {{ .Values.images.tags.barbican_api }}
+{{ tuple $envAll "barbican_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.barbican.uid }}

barbican/templates/pod-test.yaml

@@ -39,7 +39,7 @@ spec:
 {{ tuple $envAll "tests" $mounts_barbican_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
     - name: {{.Release.Name}}-barbican-test
-      image: {{ .Values.images.tags.scripted_test }}
+{{ tuple $envAll "scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

ceilometer/templates/daemonset-compute.yaml

@@ -49,8 +49,7 @@ spec:
 {{ tuple $envAll "compute" $mounts_ceilometer_compute_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-compute
-          image: {{ .Values.images.tags.ceilometer_compute }}
+{{ tuple $envAll "ceilometer_compute" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.compute | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ceilometer-compute.sh

ceilometer/templates/deployment-api.yaml

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

ceilometer/templates/deployment-central.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "central" $mounts_ceilometer_central_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-central
-          image: {{ .Values.images.tags.ceilometer_central }}
+{{ tuple $envAll "ceilometer_central" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.central | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ceilometer-central.sh

ceilometer/templates/deployment-collector.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "collector" $mounts_ceilometer_collector_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-collector
-          image: {{ .Values.images.tags.ceilometer_collector }}
+{{ tuple $envAll "ceilometer_collector" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.collector | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ceilometer-collector.sh

ceilometer/templates/deployment-notification.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "notification" $mounts_ceilometer_notification_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-notification
-          image: {{ .Values.images.tags.ceilometer_notification }}
+{{ tuple $envAll "ceilometer_notification" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.notification | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ceilometer-notification.sh

ceilometer/templates/job-db-init-mongodb.yaml

@@ -35,8 +35,7 @@ spec:
 {{ tuple $envAll "db_init_mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-db-init-mongodb
-          image: {{ .Values.images.tags.db_init_mongodb }}
+{{ tuple $envAll "db_init_mongodb" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_mongodb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION

ceilometer/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

ceph-client/templates/deployment-cephfs-provisioner.yaml

@@ -149,8 +149,7 @@ spec:
 {{ tuple $envAll "cephfs_provisioner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceph-cephfs-provisioner
-          image: {{ .Values.images.tags.ceph_cephfs_provisioner }}
+{{ tuple $envAll "ceph_cephfs_provisioner" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.cephfs_provisioner | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: PROVISIONER_NAME

ceph-client/templates/deployment-mds.yaml

@@ -40,8 +40,7 @@ spec:
       initContainers:
 {{ tuple $envAll "mds" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.tags.ceph_mds }}
+{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init-dirs.sh
           env:
@@ -60,8 +59,7 @@ spec:
               readOnly: false
       containers:
         - name: ceph-mds
-          image: {{ .Values.images.tags.ceph_mds }}
+{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.mds | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/mds-start.sh

ceph-client/templates/deployment-mgr.yaml

@@ -43,8 +43,7 @@ spec:
       initContainers:
 {{ tuple $envAll "mgr" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.tags.ceph_mgr }}
+{{ tuple $envAll "ceph_mds" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init-dirs.sh
           env:
@@ -65,8 +64,7 @@ spec:
               mountPath: /etc/ceph
       containers:
         - name: ceph-mgr
-          image: {{ .Values.images.tags.ceph_mgr }}
+{{ tuple $envAll "ceph_mgr" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER

ceph-client/templates/deployment-rbd-provisioner.yaml

@@ -139,8 +139,7 @@ spec:
 {{ tuple $envAll "rbd_provisioner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceph-rbd-provisioner
-          image: {{ .Values.images.tags.ceph_rbd_provisioner }}
+{{ tuple $envAll "ceph_rbd_provisioner" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.rbd_provisioner | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: PROVISIONER_NAME

ceph-client/templates/deployment-rgw.yaml

@@ -39,8 +39,7 @@ spec:
       initContainers:
 {{ tuple $envAll "rgw" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.tags.ceph_rgw }}
+{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init-dirs.sh
           env:
@@ -59,8 +58,7 @@ spec:
               readOnly: false
 {{ if .Values.conf.rgw_ks.enabled }}
         - name: ceph-rgw-ks-init
-          image: {{ .Values.images.tags.ceph_rgw }}
+{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER
@@ -93,8 +91,7 @@ spec:
 {{ end }}
       containers:
         - name: ceph-rgw
-          image: {{ .Values.images.tags.ceph_rgw }}
+{{ tuple $envAll "ceph_rgw" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER

ceph-client/templates/job-bootstrap.yaml

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

ceph-client/templates/job-cephfs-client-key.yaml

@@ -96,8 +96,7 @@ spec:
 {{ tuple $envAll "cephfs_client_key_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name:  ceph-storage-keys-generator
-          image: {{ .Values.images.tags.ceph_config_helper }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph-client/templates/job-namespace-client-key-cleaner.yaml

@@ -69,8 +69,7 @@ spec:
 {{ tuple $envAll "namespace_client_key_cleaner" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name:  ceph-namespace-client-keys-cleaner
-          image: {{ .Values.images.tags.ceph_config_helper }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph-client/templates/job-namespace-client-key.yaml

@@ -96,8 +96,7 @@ spec:
 {{ tuple $envAll "namespace_client_key_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name:  ceph-storage-keys-generator
-          image: {{ .Values.images.tags.ceph_config_helper }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph-client/templates/job-rbd-pool.yaml

@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "rbd_pool" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceph-rbd-pool
-          image: {{ .Values.images.tags.ceph_rbd_pool }}
+{{ tuple $envAll "ceph_rbd_pool" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.mgr | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER

ceph-mon/templates/daemonset-mon.yaml

@@ -64,8 +64,7 @@ spec:
       initContainers:
 {{ tuple $envAll "mon" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.tags.ceph_mon }}
+{{ tuple $envAll "ceph_mon" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init-dirs.sh
           env:
@@ -84,8 +83,7 @@ spec:
               readOnly: false
       containers:
         - name: ceph-mon
-          image: {{ .Values.images.tags.ceph_mon }}
+{{ tuple $envAll "ceph_mon" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.mon | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER

ceph-mon/templates/deployment-moncheck.yaml

@@ -40,8 +40,7 @@ spec:
 {{ tuple $envAll "moncheck" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceph-mon
-          image: {{ .Values.images.tags.ceph_mon_check }}
+{{ tuple $envAll "ceph_mon_check" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.moncheck | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: CLUSTER

ceph-mon/templates/job-bootstrap.yaml

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

ceph-mon/templates/job-keyring.yaml

@@ -68,8 +68,7 @@ spec:
 {{ tuple $envAll "job_keyring_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name:  ceph-{{ $jobName }}
-          image: {{ $envAll.Values.images.tags.ceph_config_helper }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph-mon/templates/job-storage-admin-keys.yaml

@@ -65,8 +65,7 @@ spec:
 {{ tuple $envAll "storage_keys_generator" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name:  ceph-storage-keys-generator
-          image: {{ .Values.images.tags.ceph_config_helper }}
+{{ tuple $envAll "ceph_config_helper" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: DEPLOYMENT_NAMESPACE

ceph-osd/templates/daemonset-osd.yaml

@@ -41,8 +41,7 @@ spec:
       initContainers:
 {{ tuple $envAll "osd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.tags.ceph_osd }}
+{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init-dirs.sh
           env:
@@ -70,8 +69,7 @@ spec:
               mountPath: /run
               readOnly: false
         - name: osd-init
-          image: {{ .Values.images.tags.ceph_osd }}
+{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -125,8 +123,7 @@ spec:
               readOnly: false
       containers:
         - name: osd-pod
-          image: {{ .Values.images.tags.ceph_osd }}
+{{ tuple $envAll "ceph_osd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true

cinder/templates/cron-job-cinder-volume-usage-audit.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "volume_usage_audit" $mounts_cinder_volume_usage_audit_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }}
           containers:
             - name: cinder-volume-usage-audit
-              image: {{ .Values.images.tags.cinder_volume_usage_audit }}
+{{ tuple $envAll "cinder_volume_usage_audit" | include "helm-toolkit.snippets.image" | indent 14 }}
-              imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               command:
                 - /tmp/volume-usage-audit.sh

cinder/templates/deployment-api.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "api" $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
         - name: ceph-coordination-volume-perms
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -63,8 +62,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-api
-          image: {{ .Values.images.tags.cinder_api }}
+{{ tuple $envAll "cinder_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.cinder.uid }}

cinder/templates/deployment-backup.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "backup" $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}
         - name: ceph-backup-keyring-placement
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -70,8 +69,7 @@ spec:
         {{ end }}
         {{- if include "cinder.is_ceph_volume_configured" $envAll }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -93,8 +91,7 @@ spec:
         {{ end }}
         {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.posix" }}
         - name: ceph-backup-volume-perms
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -108,8 +105,7 @@ spec:
         {{ end }}
         {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
         - name: ceph-coordination-volume-perms
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -123,8 +119,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-backup
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_backup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.cinder.uid }}

cinder/templates/deployment-scheduler.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "scheduler" $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
         - name: ceph-coordination-volume-perms
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -62,8 +61,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-scheduler
-          image: {{ .Values.images.tags.cinder_scheduler }}
+{{ tuple $envAll "cinder_scheduler" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.cinder.uid }}

cinder/templates/deployment-volume.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "volume" $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if include "cinder.is_ceph_volume_configured" $envAll }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.cinder_volume }}
+{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -70,8 +69,7 @@ spec:
         {{ end }}
         {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }}
         - name: ceph-coordination-volume-perms
-          image: {{ .Values.images.tags.cinder_backup }}
+{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -85,8 +83,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-volume
-          image: {{ .Values.images.tags.cinder_volume }}
+{{ tuple $envAll "cinder_volume" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.cinder.uid }}

cinder/templates/job-backup-storage-init.yaml

@@ -66,8 +66,7 @@ spec:
 {{ tuple $envAll "backup_storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.cinder_backup_storage_init }}
+{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -88,8 +87,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-backup-storage-init
-          image: {{ .Values.images.tags.cinder_backup_storage_init }}
+{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.backup_storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

cinder/templates/job-clean.yaml

@@ -71,8 +71,7 @@ spec:
       containers:
         {{- if include "cinder.is_ceph_volume_configured" $envAll }}
         - name: cinder-volume-rbd-secret-clean
-          image: {{ .Values.images.tags.cinder_storage_init }}
+{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE
@@ -91,8 +90,7 @@ spec:
         {{ end }}
         {{- if eq .Values.conf.cinder.DEFAULT.backup_driver "cinder.backup.drivers.ceph" }}
         - name: cinder-volume-backup-secret-clean
-          image: {{ .Values.images.tags.cinder_backup_storage_init }}
+{{ tuple $envAll "cinder_backup_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

cinder/templates/job-storage-init.yaml

@@ -66,8 +66,7 @@ spec:
 {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if include "cinder.is_ceph_volume_configured" $envAll }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.cinder_storage_init }}
+{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -88,8 +87,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-storage-init
-          image: {{ .Values.images.tags.cinder_storage_init }}
+{{ tuple $envAll "cinder_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

cinder/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

congress/templates/deployment-api.yaml

@@ -40,39 +40,38 @@ spec:
       nodeSelector:
         {{ .Values.labels.api.node_selector_key }}: {{ .Values.labels.api.node_selector_value }}
       containers:
-      - name: congress-api
+        - name: congress-api
-        image: {{ .Values.images.tags.congress_api }}
+{{ tuple $envAll "congress_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-        imagePullPolicy: {{ .Values.images.pull_policy }}
+          securityContext:
-        securityContext:
+            runAsUser: {{ .Values.pod.user.congress.uid }}
-          runAsUser: {{ .Values.pod.user.congress.uid }}
+          command:
-        command:
+            - /tmp/congress-api.sh
-          - /tmp/congress-api.sh
+            - start
-          - start
+          ports:
-        ports:
+            - name: c-api
-          - name: c-api
+              containerPort: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-            containerPort: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          readinessProbe:
-        readinessProbe:
+            tcpSocket:
-          tcpSocket:
+              port: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
-            port: {{ tuple "policy" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          volumeMounts:
-        volumeMounts:
+            - name: etccongress
-          - name: etccongress
+              mountPath: /etc/congress
-            mountPath: /etc/congress
+            - name: congress-bin
-          - name: congress-bin
+              mountPath: /tmp/congress-api.sh
-            mountPath: /tmp/congress-api.sh
+              subPath: congress-api.sh
-            subPath: congress-api.sh
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/congress.conf
-            mountPath: /etc/congress/congress.conf
+              subPath: congress.conf
-            subPath: congress.conf
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/api-paste.ini
-            mountPath: /etc/congress/api-paste.ini
+              subPath: api-paste.ini
-            subPath: api-paste.ini
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/policy.json
-            mountPath: /etc/congress/policy.json
+              subPath: policy.json
-            subPath: policy.json
+              readOnly: true
-            readOnly: true
       volumes:
         - name: etccongress
           emptyDir: {}

congress/templates/deployment-datasource.yaml

@@ -40,33 +40,32 @@ spec:
       nodeSelector:
         {{ .Values.labels.datasource.node_selector_key }}: {{ .Values.labels.datasource.node_selector_value }}
       containers:
-      - name: congress-datasource
+        - name: congress-datasource
-        image: {{ .Values.images.tags.congress_datasource }}
+{{ tuple $envAll "congress_datasource" | include "helm-toolkit.snippets.image" | indent 10 }}
-        imagePullPolicy: {{ .Values.images.pull_policy }}
+          securityContext:
-        securityContext:
+            runAsUser: {{ .Values.pod.user.congress.uid }}
-          runAsUser: {{ .Values.pod.user.congress.uid }}
+          command:
-        command:
+            - /tmp/congress-datasource.sh
-          - /tmp/congress-datasource.sh
+            - start
-          - start
+          volumeMounts:
-        volumeMounts:
+            - name: etccongress
-          - name: etccongress
+              mountPath: /etc/congress
-            mountPath: /etc/congress
+            - name: congress-bin
-          - name: congress-bin
+              mountPath: /tmp/congress-datasource.sh
-            mountPath: /tmp/congress-datasource.sh
+              subPath: congress-datasource.sh
-            subPath: congress-datasource.sh
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/congress.conf
-            mountPath: /etc/congress/congress.conf
+              subPath: congress.conf
-            subPath: congress.conf
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/api-paste.ini
-            mountPath: /etc/congress/api-paste.ini
+              subPath: api-paste.ini
-            subPath: api-paste.ini
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/policy.json
-            mountPath: /etc/congress/policy.json
+              subPath: policy.json
-            subPath: policy.json
+              readOnly: true
-            readOnly: true
       volumes:
         - name: etccongress
           emptyDir: {}

congress/templates/deployment-policy-engine.yaml

@@ -40,33 +40,32 @@ spec:
       nodeSelector:
         {{ .Values.labels.policy_engine.node_selector_key }}: {{ .Values.labels.policy_engine.node_selector_value }}
       containers:
-      - name: congress-policy-engine
+        - name: congress-policy-engine
-        image: {{ .Values.images.tags.congress_policy_engine }}
+{{ tuple $envAll "congress_policy_engine" | include "helm-toolkit.snippets.image" | indent 10 }}
-        imagePullPolicy: {{ .Values.images.pull_policy }}
+          securityContext:
-        securityContext:
+            runAsUser: {{ .Values.pod.user.congress.uid }}
-          runAsUser: {{ .Values.pod.user.congress.uid }}
+          command:
-        command:
+            - /tmp/congress-policy-engine.sh
-          - /tmp/congress-policy-engine.sh
+            - start
-          - start
+          volumeMounts:
-        volumeMounts:
+            - name: etccongress
-          - name: etccongress
+              mountPath: /etc/congress
-            mountPath: /etc/congress
+            - name: congress-bin
-          - name: congress-bin
+              mountPath: /tmp/congress-policy-engine.sh
-            mountPath: /tmp/congress-policy-engine.sh
+              subPath: congress-policy-engine.sh
-            subPath: congress-policy-engine.sh
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/congress.conf
-            mountPath: /etc/congress/congress.conf
+              subPath: congress.conf
-            subPath: congress.conf
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/api-paste.ini
-            mountPath: /etc/congress/api-paste.ini
+              subPath: api-paste.ini
-            subPath: api-paste.ini
+              readOnly: true
-            readOnly: true
+            - name: congress-etc
-          - name: congress-etc
+              mountPath: /etc/congress/policy.json
-            mountPath: /etc/congress/policy.json
+              subPath: policy.json
-            subPath: policy.json
+              readOnly: true
-            readOnly: true
       volumes:
         - name: etccongress
           emptyDir: {}

congress/templates/job-ds-create.yaml

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

congress/templates/pod-test.yaml

@@ -32,7 +32,7 @@ spec:
   restartPolicy: Never
   containers:
     - name: {{.Release.Name}}-congress-test
-      image: {{ .Values.images.tags.congress_scripted_test }}
+{{ tuple $envAll "congress_scripted_test" | include "helm-toolkit.snippets.image" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}

etcd/templates/deployment.yaml

@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "etcd" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: etcd
-          image: {{ .Values.images.tags.etcd }}
+{{ tuple $envAll "etcd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/etcd.sh
           ports:

glance/templates/deployment-api.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "api" $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: glance-perms
-          image: {{ .Values.images.tags.glance_api }}
+{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -62,8 +61,7 @@ spec:
               mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
         {{ if eq .Values.storage "rbd" }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.glance_api }}
+{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}
           env:
@@ -85,8 +83,7 @@ spec:
         {{ end }}
       containers:
         - name: glance-api
-          image: {{ .Values.images.tags.glance_api }}
+{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}

glance/templates/deployment-registry.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "registry" $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-registry
-          image: {{ .Values.images.tags.glance_registry }}
+{{ tuple $envAll "glance_registry" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}

glance/templates/job-clean.yaml

@@ -71,8 +71,7 @@ spec:
       containers:
         {{- if eq .Values.storage "rbd" }}
         - name: glance-secret-clean
-          image: {{ .Values.images.tags.glance_storage_init }}
+{{ tuple $envAll "glance_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE
@@ -90,8 +89,7 @@ spec:
               readOnly: true
         {{ end }}
         - name: glance-image-clean
-          image: {{ .Values.images.tags.bootstrap }}
+{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

glance/templates/job-storage-init.yaml

@@ -66,8 +66,7 @@ spec:
 {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.glance_api }}
+{{ tuple $envAll "glance_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}
           command:
@@ -88,8 +87,7 @@ spec:
         {{ end }}
       containers:
         - name: glance-storage-init
-          image: {{ .Values.images.tags.glance_storage_init }}
+{{ tuple $envAll "glance_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

glance/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

gnocchi/templates/daemonset-metricd.yaml

@@ -43,8 +43,7 @@ spec:
       initContainers:
 {{ tuple $envAll "metricd" $mounts_gnocchi_metricd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ceph-keyring.sh
           volumeMounts:
@@ -60,8 +59,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-metricd
-          image: {{ .Values.images.tags.gnocchi_metricd }}
+{{ tuple $envAll "gnocchi_metricd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.metricd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/gnocchi-metricd.sh

gnocchi/templates/daemonset-statsd.yaml

@@ -42,8 +42,7 @@ spec:
       initContainers:
 {{ tuple $envAll "statsd" $mounts_gnocchi_statsd_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ceph-keyring.sh
           volumeMounts:
@@ -59,8 +58,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-statsd
-          image: {{ .Values.images.tags.gnocchi_statsd }}
+{{ tuple $envAll "gnocchi_statsd" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.statsd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/gnocchi-statsd.sh

gnocchi/templates/deployment-api.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "api" $mounts_gnocchi_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ceph-keyring.sh
           volumeMounts:
@@ -64,8 +63,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-api
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/gnocchi-api.sh

gnocchi/templates/job-clean.yaml

@@ -69,8 +69,7 @@ spec:
 {{ tuple $envAll "clean" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: gnocchi-rbd-secret-clean
-          image: {{ .Values.images.tags.gnocchi_storage_init }}
+{{ tuple $envAll "gnocchi_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.clean | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

gnocchi/templates/job-db-init-indexer.yaml

@@ -38,8 +38,7 @@ spec:
 {{ tuple $envAll "db_init_postgresql" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: gnocchi-db-init-indexer
-          image: {{ .Values.images.tags.db_init_indexer }}
+{{ tuple $envAll "db_init_indexer" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_indexer | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION

gnocchi/templates/job-db-sync.yaml

@@ -37,8 +37,7 @@ spec:
       initContainers:
 {{ tuple $envAll "db_sync" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ceph-keyring.sh
           volumeMounts:
@@ -54,8 +53,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+{{ tuple $envAll "db_sync" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh

gnocchi/templates/job-storage-init.yaml

@@ -65,8 +65,7 @@ spec:
       initContainers:
 {{ tuple $envAll "storage_init" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.gnocchi.uid }}
           command:
@@ -84,8 +83,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-storage-init
-          image: {{ .Values.images.tags.gnocchi_storage_init }}
+{{ tuple $envAll "gnocchi_storage_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: NAMESPACE

gnocchi/templates/pod-gnocchi-test.yaml

@@ -38,8 +38,7 @@ spec:
 {{ tuple $envAll "tests" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
     - name: {{.Release.Name}}-helm-tests
-      image: {{ .Values.images.tags.gnocchi_api }}
+{{ tuple $envAll "gnocchi_api" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

heat/templates/cron-job-engine-cleaner.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "engine_cleaner" $mounts_heat_engine_cleaner_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 12 }}
           containers:
             - name: heat-engine-cleaner
-              image: {{ .Values.images.tags.heat_engine_cleaner }}
+{{ tuple $envAll "heat_engine_cleaner" | include "helm-toolkit.snippets.image" | indent 14 }}
-              imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.engine_cleaner | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               command:
                 - /tmp/heat-engine-cleaner.sh

heat/templates/deployment-api.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "api" $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-api
-          image: {{ .Values.images.tags.heat_api }}
+{{ tuple $envAll "heat_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.heat.uid }}

heat/templates/deployment-cfn.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "cfn" $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-cfn
-          image: {{ .Values.images.tags.heat_cfn }}
+{{ tuple $envAll "heat_cfn" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.heat.uid }}

heat/templates/deployment-cloudwatch.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "cloudwatch" $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-cloudwatch
-          image: {{ .Values.images.tags.heat_cloudwatch }}
+{{ tuple $envAll "heat_cloudwatch" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.heat.uid }}

heat/templates/deployment-engine.yaml

@@ -56,8 +56,7 @@ spec:
 {{ tuple $envAll "engine" $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-engine
-          image: {{ .Values.images.tags.heat_engine }}
+{{ tuple $envAll "heat_engine" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.heat.uid }}

heat/templates/job-ks-user-domain.yaml

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

heat/templates/job-trusts.yaml

@@ -40,8 +40,7 @@ spec:
 {{ tuple $envAll "trusts" $mounts_heat_trusts_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-trusts
-          image: {{ $envAll.Values.images.tags.ks_service }}
+{{ tuple $envAll "ks_service" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.trusts | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - bash

heat/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

horizon/templates/deployment.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "dashboard" $mounts_horizon_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: horizon
-          image: {{ .Values.images.tags.horizon }}
+{{ tuple $envAll "horizon" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0

horizon/templates/job-db-sync.yaml

@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "db_sync" $mounts_horizon_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: horizon-db-sync
-          image: {{ .Values.images.tags.horizon_db_sync }}
+{{ tuple $envAll "horizon_db_sync" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/db-sync.sh

ingress/templates/deployment-error.yaml

@@ -42,8 +42,7 @@ spec:
 {{ tuple $envAll "error_pages" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ingress-error-pages
-          image: {{ .Values.images.tags.error_pages }}
+{{ tuple $envAll "error_pages" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           livenessProbe:
             httpGet:

ingress/templates/deployment-ingress.yaml

@@ -182,8 +182,7 @@ spec:
 {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if and .Values.network.host_namespace .Values.network.vip.manage }}
         - name: ingress-vip-kernel-modules
-          image: {{ .Values.images.tags.ingress }}
+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:
@@ -201,8 +200,7 @@ spec:
               mountPath: /mnt/host-rootfs
               readOnly: true
         - name: ingress-vip-init
-          image: {{ .Values.images.tags.ingress }}
+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:
@@ -221,8 +219,7 @@ spec:
 {{- end }}
       containers:
         - name: ingress
-          image: {{ .Values.images.tags.ingress }}
+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           readinessProbe:
             httpGet:
@@ -279,8 +276,7 @@ spec:
               readOnly: true
 {{- if and .Values.network.host_namespace .Values.network.vip.manage }}
         - name: ingress-vip
-          image: {{ .Values.images.tags.ingress }}
+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:

ironic/templates/deployment-api.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "api" $mounts_ironic_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ironic-retrive-swift-config
-          image: {{ .Values.images.tags.ironic_retrive_swift_config }}
+{{ tuple $envAll "ironic_retrive_swift_config" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: OS_SWIFT_API_VERSION
@@ -66,8 +65,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: ironic-retrive-cleaning-net
-          image: {{ .Values.images.tags.ironic_retrive_cleaning_network }}
+{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}
@@ -85,8 +83,7 @@ spec:
               mountPath: /tmp/pod-shared
       containers:
         - name: ironic-api
-          image: {{ .Values.images.tags.ironic_api }}
+{{ tuple $envAll "ironic_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ironic-api.sh

ironic/templates/job-manage-cleaning-network.yaml

@@ -38,8 +38,7 @@ spec:
 {{ tuple $envAll "manage_cleaning_network" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
       containers:
         - name: ironic-manage-cleaning-network
-          image: {{ .Values.images.tags.ironic_manage_cleaning_network }}
+{{ tuple $envAll "ironic_manage_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.manage_cleaning_network | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}

ironic/templates/statefulset-conductor.yaml

@@ -48,8 +48,7 @@ spec:
       initContainers:
 {{ tuple $envAll "conductor" $mounts_ironic_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ironic-conductor-pxe-init
-          image: {{ .Values.images.tags.ironic_pxe_init }}
+{{ tuple $envAll "ironic_pxe_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ironic-conductor-pxe-init.sh
@@ -61,8 +60,7 @@ spec:
             - name: pod-data
               mountPath: /var/lib/openstack-helm
         - name: ironic-conductor-init
-          image: {{ .Values.images.tags.ironic_conductor }}
+{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: PROVISIONER_INTERFACE
@@ -77,8 +75,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: ironic-conductor-http-init
-          image: {{ .Values.images.tags.ironic_conductor }}
+{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: PROVISIONER_INTERFACE
@@ -97,8 +94,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: ironic-retrive-swift-config
-          image: {{ .Values.images.tags.ironic_retrive_swift_config }}
+{{ tuple $envAll "ironic_retrive_swift_config" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: OS_SWIFT_API_VERSION
@@ -116,8 +112,7 @@ spec:
             - name: pod-shared
               mountPath: /tmp/pod-shared
         - name: ironic-retrive-cleaning-net
-          image: {{ .Values.images.tags.ironic_retrive_cleaning_network }}
+{{ tuple $envAll "ironic_retrive_cleaning_network" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.ironic }}
@@ -135,8 +130,7 @@ spec:
               mountPath: /tmp/pod-shared
       containers:
         - name: ironic-conductor
-          image: {{ .Values.images.tags.ironic_conductor }}
+{{ tuple $envAll "ironic_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -170,8 +164,7 @@ spec:
             - name: pod-data
               mountPath: /var/lib/openstack-helm
         - name: ironic-conductor-pxe
-          image: {{ .Values.images.tags.ironic_pxe }}
+{{ tuple $envAll "ironic_pxe" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -192,8 +185,7 @@ spec:
             - name: pod-data
               mountPath: /var/lib/openstack-helm
         - name: ironic-conductor-http
-          image: {{ .Values.images.tags.ironic_pxe_http }}
+{{ tuple $envAll "ironic_pxe_http" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ironic-conductor-http.sh

keystone/templates/cron-job-credential-rotate.yaml

@@ -75,8 +75,7 @@ spec:
             {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
           containers:
             - name: keystone-credential-rotate
-              image: {{ .Values.images.tags.keystone_credential_rotate }}
+{{ tuple $envAll "keystone_credential_rotate" | include "helm-toolkit.snippets.image" | indent 14 }}
-              imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               env:
               - name: KEYSTONE_USER

keystone/templates/cron-job-fernet-rotate.yaml

@@ -76,8 +76,7 @@ spec:
             {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
           containers:
             - name: keystone-fernet-rotate
-              image: {{ .Values.images.tags.keystone_fernet_rotate }}
+{{ tuple $envAll "keystone_fernet_rotate" | include "helm-toolkit.snippets.image" | indent 14 }}
-              imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               env:
               - name: KEYSTONE_USER

keystone/templates/deployment-api.yaml

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

keystone/templates/job-credential-setup.yaml

@@ -69,8 +69,7 @@ spec:
         {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
       containers:
         - name: keystone-credential-setup
-          image: {{ .Values.images.tags.keystone_credential_setup }}
+{{ tuple $envAll "keystone_credential_setup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
           - name: KEYSTONE_USER

keystone/templates/job-domain-manage.yaml

@@ -40,8 +40,7 @@ spec:
       initContainers:
 {{ tuple $envAll "domain_manage" $mounts_keystone_domain_manage_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
         - name: keystone-domain-manage-init
-          image: {{ .Values.images.tags.bootstrap }}
+{{ tuple $envAll "bootstrap" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.domain_manage | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
@@ -56,8 +55,7 @@ spec:
               readOnly: true
       containers:
         - name: keystone-domain-manage
-          image: {{ .Values.images.tags.keystone_domain_manage }}
+{{ tuple $envAll "keystone_domain_manage" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.domain_manage | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

keystone/templates/job-fernet-setup.yaml

@@ -70,8 +70,7 @@ spec:
         {{ .Values.labels.job.node_selector_key }}: {{ .Values.labels.job.node_selector_value }}
       containers:
         - name: keystone-fernet-setup
-          image: {{ .Values.images.tags.keystone_fernet_setup }}
+{{ tuple $envAll "keystone_fernet_setup" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
           - name: KEYSTONE_USER

keystone/templates/pod-rally-test.yaml

@@ -35,8 +35,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -58,8 +57,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

ldap/templates/statefulset.yaml

@@ -40,22 +40,21 @@ spec:
       initContainers:
 {{ tuple $envAll "ldap" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
-      - name: ldap
+        - name: ldap
-        image: {{ .Values.images.tags.ldap }}
+{{ tuple $envAll "ldap" | include "helm-toolkit.snippets.image" | indent 10 }}
-        imagePullPolicy: {{ .Values.images.pull_policy }}
-        env:
-        - name: LDAP_DOMAIN
-          value: {{ .Values.endpoints.ldap.auth.domainname }}
-        - name: LDAP_ADMIN_PASSWORD
-          value: {{ .Values.endpoints.ldap.auth.password }}
-        ports:
-        - containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
-        volumeMounts:
+          env:
-        - name: ldap-data
+          - name: LDAP_DOMAIN
-          mountPath: /var/lib/ldap
+            value: {{ .Values.endpoints.ldap.auth.domainname }}
-        - name: ldap-config
+          - name: LDAP_ADMIN_PASSWORD
-          mountPath: /etc/ldap/slapd.d
+            value: {{ .Values.endpoints.ldap.auth.password }}
+          ports:
+          - containerPort: {{ tuple "ldap" "internal" "ldap" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+          volumeMounts:
+          - name: ldap-data
+            mountPath: /var/lib/ldap
+          - name: ldap-config
+            mountPath: /etc/ldap/slapd.d
 {{- if not .Values.volume.enabled }}
       volumes:
       - name: ldap-data

libvirt/templates/daemonset-libvirt.yaml

@@ -48,8 +48,7 @@ spec:
 {{- if .Values.conf.ceph.enabled }}
         {{- if empty .Values.conf.ceph.cinder.keyring }}
         - name: ceph-admin-keyring-placement
-          image: {{ .Values.images.tags.libvirt }}
+{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           command:
@@ -69,8 +68,7 @@ spec:
             {{ end }}
         {{ end }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.libvirt }}
+{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
           env:
@@ -98,8 +96,7 @@ spec:
 {{- end }}
       containers:
         - name: libvirt
-          image: {{ .Values.images.tags.libvirt }}
+{{ tuple $envAll "libvirt" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.libvirt | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true

magnum/templates/deployment-api.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "api" $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: magnum-api
-          image: {{ .Values.images.tags.magnum_api }}
+{{ tuple $envAll "magnum_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.magnum.uid }}

magnum/templates/job-ks-user-domain.yaml

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

magnum/templates/statefulset-conductor.yaml

@@ -44,8 +44,7 @@ spec:
       initContainers:
 {{ tuple $envAll "conductor" $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: magnum-conductor-init
-          image: {{ .Values.images.tags.magnum_conductor }}
+{{ tuple $envAll "magnum_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.magnum.uid }}
@@ -65,8 +64,7 @@ spec:
               mountPath: /tmp/pod-shared
       containers:
         - name: magnum-conductor
-          image: {{ .Values.images.tags.magnum_conductor }}
+{{ tuple $envAll "magnum_conductor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.magnum.uid }}

mariadb/templates/deployment-error.yaml

@@ -45,8 +45,7 @@ spec:
 {{ tuple $envAll "error_pages" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ingress-error-pages
-          image: {{ .Values.images.tags.error_pages }}
+{{ tuple $envAll "error_pages" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.error_pages | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           livenessProbe:
             httpGet:

mariadb/templates/deployment-ingress.yaml

@@ -140,8 +140,7 @@ spec:
 {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ingress
-          image: {{ .Values.images.tags.ingress }}
+{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.ingress | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           readinessProbe:
             tcpSocket:

mariadb/templates/monitoring/prometheus/exporter-deployment.yaml

@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "prometheus_mysql_exporter" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mysql-exporter
-          image: {{ .Values.images.tags.prometheus_mysql_exporter }}
+{{ tuple $envAll "prometheus_mysql_exporter" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.prometheus_mysql_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/mysqld-exporter.sh

mariadb/templates/monitoring/prometheus/exporter-job-create-user.yaml

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

mariadb/templates/statefulset.yaml

@@ -43,8 +43,7 @@ spec:
 {{ tuple $envAll "mariadb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if .Values.volume.chown_on_start }}
         - name: mariadb-perms
-          image: {{ .Values.images.tags.mariadb }}
+{{ tuple $envAll "mariadb" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -59,8 +58,7 @@ spec:
 {{- end }}
       containers:
         - name: mariadb
-          image: {{ .Values.images.tags.mariadb }}
+{{ tuple $envAll "mariadb" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: POD_IP

memcached/templates/deployment.yaml

@@ -43,8 +43,7 @@ spec:
 {{ tuple $envAll "memcached" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 9 }}
       containers:
         - name: memcached
-          image: {{ .Values.images.tags.memcached }}
+{{ tuple $envAll "memcached" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: MEMCACHED_PORT

mistral/templates/deployment-api.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "api" $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-api
-          image: {{ .Values.images.tags.mistral_api }}
+{{ tuple $envAll "mistral_api" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.mistral.uid }}

mistral/templates/deployment-executor.yaml

@@ -47,8 +47,7 @@ spec:
 {{ tuple $envAll "executor" $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-executor
-          image: {{ .Values.images.tags.mistral_executor }}
+{{ tuple $envAll "mistral_executor" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.mistral.uid }}

mistral/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}

mistral/templates/statefulset-engine.yaml

@@ -44,8 +44,7 @@ spec:
 {{ tuple $envAll "engine" $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-engine
-          image: {{ .Values.images.tags.mistral_engine }}
+{{ tuple $envAll "mistral_engine" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.mistral.uid }}

mistral/templates/statefulset-event-engine.yaml

@@ -44,8 +44,7 @@ spec:
 {{ tuple $envAll "event_engine" $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-event-engine
-          image: {{ .Values.images.tags.mistral_event_engine }}
+{{ tuple $envAll "mistral_event_engine" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.mistral.uid }}

mongodb/templates/statefulset.yaml

@@ -41,8 +41,7 @@ spec:
 {{ tuple $envAll "mongodb" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
 {{- if $envAll.Values.volume.chown_on_start }}
         - name: mongodb-perms
-          image: {{ $envAll.Values.images.tags.mongodb }}
+{{ tuple $envAll "mongodb" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
@@ -57,10 +56,9 @@ spec:
 {{- end }}
       containers:
         - name: mongodb
-          image: {{ .Values.images.tags.mongodb }}
+{{ tuple $envAll "mongodb" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           ports:
-          - containerPort: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
+            - containerPort: {{ tuple "mongodb" "internal" "mongodb" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
           env:
             - name: ADMIN_PASS
               valueFrom:

neutron/templates/daemonset-dhcp-agent.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_dhcp_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-dhcp-agent
-          image: {{ .Values.images.tags.neutron_dhcp }}
+{{ tuple $envAll "neutron_dhcp" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.dhcp | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/daemonset-l3-agent.yaml

@@ -48,8 +48,7 @@ spec:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_l3_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-l3-agent
-          image: {{ .Values.images.tags.neutron_l3 }}
+{{ tuple $envAll "neutron_l3" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.l3 | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/daemonset-lb-agent.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_lb_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: neutron-lb-agent-kernel-modules
-          image: {{ .Values.images.tags.neutron_linuxbridge_agent }}
+{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:
@@ -65,8 +64,7 @@ spec:
               mountPath: /mnt/host-rootfs
               readOnly: true
         - name: neutron-lb-agent-init
-          image: {{ .Values.images.tags.neutron_linuxbridge_agent }}
+{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -118,8 +116,7 @@ spec:
 {{ if $mounts_neutron_lb_agent.volumeMounts }}{{ toYaml $mounts_neutron_lb_agent.volumeMounts | indent 12 }}{{ end }}
       containers:
         - name: neutron-lb-agent
-          image: {{ .Values.images.tags.neutron_linuxbridge_agent }}
+{{ tuple $envAll "neutron_linuxbridge_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.lb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/daemonset-metadata-agent.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_metadata_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: neutron-metadata-agent-init
-          image: {{ .Values.images.tags.neutron_metadata }}
+{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: 0
@@ -70,8 +69,7 @@ spec:
               mountPath: /var/lib/neutron/openstack-helm
       containers:
         - name: neutron-metadata-agent
-          image: {{ .Values.images.tags.neutron_metadata }}
+{{ tuple $envAll "neutron_metadata" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.metadata | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/daemonset-ovs-agent.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_ovs_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: neutron-openvswitch-agent-kernel-modules
-          image: {{ .Values.images.tags.neutron_openvswitch_agent }}
+{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             capabilities:
               add:
@@ -65,8 +64,7 @@ spec:
               mountPath: /mnt/host-rootfs
               readOnly: true
         - name: neutron-ovs-agent-init
-          image: {{ .Values.images.tags.neutron_openvswitch_agent }}
+{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -118,8 +116,7 @@ spec:
 {{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }}
       containers:
         - name: neutron-ovs-agent
-          image: {{ .Values.images.tags.neutron_openvswitch_agent }}
+{{ tuple $envAll "neutron_openvswitch_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.ovs | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/daemonset-sriov-agent.yaml

@@ -47,8 +47,7 @@ spec:
       initContainers:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_sriov_agent_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: neutron-sriov-agent-init
-          image: {{ .Values.images.tags.neutron_sriov_agent_init }}
+{{ tuple $envAll "neutron_sriov_agent_init" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             privileged: true
@@ -100,8 +99,7 @@ spec:
 {{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }}
       containers:
         - name: neutron-sriov-agent
-          image: {{ .Values.images.tags.neutron_sriov_agent }}
+{{ tuple $envAll "neutron_sriov_agent" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.agent.sriov | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/deployment-server.yaml

@@ -51,8 +51,7 @@ spec:
 {{ tuple $envAll "pod_dependency" $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: neutron-server
-          image: {{ .Values.images.tags.neutron_server }}
+{{ tuple $envAll "neutron_server" | include "helm-toolkit.snippets.image" | indent 10 }}
-          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.server | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
             runAsUser: {{ .Values.pod.user.neutron.uid }}

neutron/templates/pod-rally-test.yaml

@@ -37,8 +37,7 @@ spec:
   initContainers:
 {{ tuple $envAll "tests" $mounts_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: {{ .Release.Name }}-test-ks-user
-      image: {{ .Values.images.tags.ks_user }}
+{{ tuple $envAll "ks_user" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       command:
         - /tmp/ks-user.sh
@@ -60,8 +59,7 @@ spec:
           value: {{ .Values.endpoints.identity.auth.test.role | quote }}
   containers:
     - name: {{ .Release.Name }}-test
-      image: {{ .Values.images.tags.test }}
+{{ tuple $envAll "test" | include "helm-toolkit.snippets.image" | indent 6 }}
-      imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}