Images: Update values to allow simple parse of images being used

This PS updates the values file layout for images to allow simple
parsing of the images in use by charts, allowing them to be queried
and modified much more simply. By moving the image tags to a 'tags'
key, we can extend the options used simply to accomodate extra
options simply (eg prefixing the tag for use with an internal
registry) or pre-pulling the images to reduce chart deploy failure.

Change-Id: I9ec1dbb00d997ab6cb021bf0b698f7aae740e95d

barbican/templates/deployment-api.yaml

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

barbican/templates/job-bootstrap.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_barbican_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
       containers:
         - name: barbican-bootstrap
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

barbican/templates/job-db-drop.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: barbican-db-drop
-          image: {{ .Values.images.db_drop }}
+          image: {{ .Values.images.tags.db_drop }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

barbican/templates/job-db-init.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: barbican-db-init
-          image: {{ .Values.images.db_init }}
+          image: {{ .Values.images.tags.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

barbican/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: barbican-db-sync
-          image: {{ .Values.images.db_sync }}
+          image: {{ .Values.images.tags.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

barbican/templates/job-ks-endpoints.yaml

@@ -37,7 +37,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "key-manager" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

barbican/templates/job-ks-service.yaml

@@ -36,7 +36,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "key-manager" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

barbican/templates/job-ks-user.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: barbican-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

barbican/templates/pod-test.yaml

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

barbican/values.yaml

@@ -17,16 +17,17 @@ labels:
 release_group: null
 
 images:
+  tags:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    scripted_test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
+    barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
     db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
+    barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
   pull_policy: "IfNotPresent"
 
 pod:

ceilometer/templates/deployment-api.yaml

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

ceilometer/templates/deployment-central.yaml

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

ceilometer/templates/deployment-collector.yaml

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

ceilometer/templates/deployment-compute.yaml

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

ceilometer/templates/deployment-notification.yaml

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

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

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

ceilometer/templates/job-db-init.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-db-init
-          image: {{ .Values.images.db_init | quote }}
+          image: {{ .Values.images.tags.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

ceilometer/templates/job-db-sync.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-db-sync
-          image: {{ .Values.images.db_sync }}
+          image: {{ .Values.images.tags.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceilometer/templates/job-ks-endpoints.yaml

@@ -34,7 +34,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "metering" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceilometer/templates/job-ks-service.yaml

@@ -33,7 +33,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "metering" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceilometer/templates/job-ks-user.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceilometer/templates/pod-rally-test.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_ceilometer_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
   containers:
     - name: {{.Release.Name}}-token-issue-test
-      image: {{ .Values.images.test }}
+      image: {{ .Values.images.tags.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:

ceilometer/values.yaml

@@ -38,6 +38,7 @@ labels:
     node_selector_value: enabled
 
 images:
+  tags:
     test: docker.io/kolla/ubuntu-binary-rally:4.0.0
     db_init_mongodb: docker.io/mongo:3.4.9-jessie
     db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3

ceph/templates/daemonset-mon.yaml

@@ -37,7 +37,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init_dirs.sh
@@ -58,7 +58,7 @@ spec:
               readOnly: false
       containers:
         - name: ceph-mon
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

ceph/templates/daemonset-osd.yaml

@@ -36,7 +36,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init_dirs.sh
@@ -57,7 +57,7 @@ spec:
               readOnly: false
       containers:
         - name: osd-pod
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.osd | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:

ceph/templates/deployment-mds.yaml

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

ceph/templates/deployment-moncheck.yaml

@@ -38,7 +38,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init_dirs.sh
@@ -56,7 +56,7 @@ spec:
               readOnly: false
       containers:
         - name: ceph-mon
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.moncheck | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

ceph/templates/deployment-rbd-provisioner.yaml

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

ceph/templates/deployment-rgw.yaml

@@ -39,7 +39,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies "" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-init-dirs
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/init_dirs.sh
@@ -60,7 +60,7 @@ spec:
               readOnly: false
 {{ if .Values.ceph.rgw_keystone_auth }}
         - name: ceph-rgw-ks-init
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
@@ -92,7 +92,7 @@ spec:
 {{ end }}
       containers:
         - name: ceph-rgw
-          image: {{ .Values.images.daemon }}
+          image: {{ .Values.images.tags.daemon }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.rgw | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

ceph/templates/job-bootstrap.yaml

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

ceph/templates/job-keyring.yaml

@@ -36,7 +36,7 @@ spec:
         {{ $envAll.Values.labels.jobs.node_selector_key }}: {{ $envAll.Values.labels.jobs.node_selector_value }}
       containers:
         - name:  ceph-{{ $jobName }}
-          image: {{ $envAll.Values.images.ceph_config_helper }}
+          image: {{ $envAll.Values.images.tags.ceph_config_helper }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.secret_provisioning | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

ceph/templates/job-ks-endpoints.yaml

@@ -38,7 +38,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "object-store" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceph/templates/job-ks-service.yaml

@@ -37,7 +37,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "object-store" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

ceph/templates/job-ks-user.yaml

@@ -36,7 +36,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceph-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

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

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

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

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

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

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

ceph/values.yaml

@@ -20,6 +20,7 @@ deployment:
   rgw_keystone_user_and_endpoints: false
 
 images:
+  tags:
     ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3

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

@@ -41,7 +41,7 @@ spec:
             {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
           containers:
             - name: cinder-volume-usage-audit
-              image: {{ .Values.images.volume_usage_audit }}
+              image: {{ .Values.images.tags.volume_usage_audit }}
               imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.volume_usage_audit | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               command:

cinder/templates/deployment-api.yaml

@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_cinder_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-api
-          image: {{ .Values.images.api }}
+          image: {{ .Values.images.tags.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:

cinder/templates/deployment-backup.yaml

@@ -43,7 +43,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_cinder_backup_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if include "cinder.is_ceph_backup_configured" . }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.backup }}
+          image: {{ .Values.images.tags.backup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
@@ -63,7 +63,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-backup
-          image: {{ .Values.images.backup }}
+          image: {{ .Values.images.tags.backup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.backup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:

cinder/templates/deployment-scheduler.yaml

@@ -43,7 +43,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_cinder_scheduler_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-scheduler
-          image: {{ .Values.images.scheduler }}
+          image: {{ .Values.images.tags.scheduler }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.scheduler | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:

cinder/templates/deployment-volume.yaml

@@ -43,7 +43,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_cinder_volume_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{- if include "cinder.is_ceph_volume_configured" . }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.volume }}
+          image: {{ .Values.images.tags.volume }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
@@ -63,7 +63,7 @@ spec:
         {{ end }}
       containers:
         - name: cinder-volume
-          image: {{ .Values.images.volume }}
+          image: {{ .Values.images.tags.volume }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.volume | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:

cinder/templates/job-bootstrap.yaml

@@ -36,7 +36,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-bootstrap
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

cinder/templates/job-db-drop.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-db-drop
-          image: {{ .Values.images.db_drop | quote }}
+          image: {{ .Values.images.tags.db_drop | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

cinder/templates/job-db-init.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-db-init
-          image: {{ .Values.images.db_init | quote }}
+          image: {{ .Values.images.tags.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

cinder/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-db-sync
-          image: {{ .Values.images.db_sync }}
+          image: {{ .Values.images.tags.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

cinder/templates/job-ks-endpoints.yaml

@@ -37,7 +37,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

cinder/templates/job-ks-service.yaml

@@ -36,7 +36,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

cinder/templates/job-ks-user.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

cinder/templates/pod-rally-test.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_cinder_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
     - name: {{.Release.Name}}-token-issue-test
-      image: {{ .Values.images.test }}
+      image: {{ .Values.images.tags.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:

cinder/values.yaml

@@ -26,6 +26,7 @@ labels:
 release_group: null
 
 images:
+  tags:
     test: docker.io/kolla/ubuntu-source-rally:4.0.0
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_sync: docker.io/kolla/ubuntu-source-cinder-api:3.0.3

dns-helper/templates/daemonset-dns-helper.yaml

@@ -30,7 +30,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
       - name: dns-helper
-        image: {{ .Values.images.dns_helper }}
+        image: {{ .Values.images.tags.dns_helper }}
         imagePullPolicy: {{ .Values.images.pull_policy }}
         command:
           - /tmp/dns-helper.sh

dns-helper/values.yaml

@@ -22,5 +22,6 @@ labels:
   node_selector_value: enabled
 
 images:
+  tags:
     dns_helper: docker.io/ubuntu:16.04
   pull_policy: "IfNotPresent"

etcd/templates/deployment.yaml

@@ -32,7 +32,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: etcd
-          image: {{ .Values.images.etcd }}
+          image: {{ .Values.images.tags.etcd }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - etcd

etcd/values.yaml

@@ -18,6 +18,7 @@
 # name: value
 
 images:
+  tags:
     etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5'
   pull_policy: IfNotPresent
 

glance/templates/deployment-api.yaml

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

glance/templates/deployment-registry.yaml

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

glance/templates/job-bootstrap.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-bootstrap
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

glance/templates/job-clean.yaml

@@ -34,7 +34,7 @@ spec:
       containers:
         {{- if eq .Values.storage "rbd" }}
         - name: glance-secret-clean
-          image: {{ .Values.images.storage_init }}
+          image: {{ .Values.images.tags.storage_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
@@ -53,7 +53,7 @@ spec:
               readOnly: true
         {{ end }}
         - name: glance-image-clean
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

glance/templates/job-db-drop.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-db-drop
-          image: {{ .Values.images.db_drop }}
+          image: {{ .Values.images.tags.db_drop }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

glance/templates/job-db-init.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-db-init
-          image: {{ .Values.images.db_init }}
+          image: {{ .Values.images.tags.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

glance/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-db-sync
-          image: {{ .Values.images.db_sync }}
+          image: {{ .Values.images.tags.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

glance/templates/job-ks-endpoints.yaml

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

glance/templates/job-ks-service.yaml

@@ -36,7 +36,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "image" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

glance/templates/job-ks-user.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

glance/templates/job-storage-init.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | 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.api }}
+          image: {{ .Values.images.tags.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}
@@ -55,7 +55,7 @@ spec:
         {{ end }}
       containers:
         - name: glance-storage-init
-          image: {{ .Values.images.storage_init }}
+          image: {{ .Values.images.tags.storage_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

glance/templates/pod-rally-test.yaml

@@ -32,7 +32,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_glance_tests_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
   containers:
     - name: {{.Release.Name}}-token-issue-test
-      image: {{ .Values.images.test }}
+      image: {{ .Values.images.tags.test }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:

glance/values.yaml

@@ -27,6 +27,7 @@ labels:
 release_group: null
 
 images:
+  tags:
     test: docker.io/kolla/ubuntu-source-rally:4.0.0
     storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3

gnocchi/templates/daemonset-metricd.yaml

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

gnocchi/templates/daemonset-statsd.yaml

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

gnocchi/templates/deployment-api.yaml

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

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

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

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

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: keystone-db-init
-          image: {{ .Values.images.db_init_keystone | quote }}
+          image: {{ .Values.images.tags.db_init_keystone | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

gnocchi/templates/job-db-sync.yaml

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

gnocchi/templates/job-ks-endpoints.yaml

@@ -39,7 +39,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "metric" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

gnocchi/templates/job-ks-service.yaml

@@ -36,7 +36,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "metric" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

gnocchi/templates/job-ks-user.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: gnocchi-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

gnocchi/templates/job-storage-init.yaml

@@ -34,7 +34,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.api }}
+          image: {{ .Values.images.tags.api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.gnocchi.uid }}
@@ -53,7 +53,7 @@ spec:
               readOnly: true
       containers:
         - name: gnocchi-storage-init
-          image: {{ .Values.images.storage_init }}
+          image: {{ .Values.images.tags.storage_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

gnocchi/templates/pod-gnocchi-test.yaml

@@ -31,7 +31,7 @@ spec:
   initContainers:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 4 }}
     - name: ceph-keyring-placement
-      image: {{ .Values.images.api }}
+      image: {{ .Values.images.tags.api }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
       command:
         - /tmp/ceph-keyring.sh
@@ -48,7 +48,7 @@ spec:
           readOnly: true
   containers:
     - name: {{.Release.Name}}-helm-tests
-      image: {{ .Values.images.api }}
+      image: {{ .Values.images.tags.api }}
       imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.tests | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
       env:

gnocchi/values.yaml

@@ -7,6 +7,7 @@ labels:
   node_selector_value: enabled
 
 images:
+  tags:
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
     storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
     db_init_indexer: docker.io/postgres:9.5

heat/templates/deployment-api.yaml

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

heat/templates/deployment-cfn.yaml

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

heat/templates/deployment-cloudwatch.yaml

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

heat/templates/deployment-engine.yaml

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

heat/templates/job-bootstrap.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_heat_bootstrap_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container"  | indent 8 }}
       containers:
         - name: heat-bootstrap
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

heat/templates/job-db-drop.yaml

@@ -38,7 +38,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-db-drop
-          image: {{ .Values.images.db_drop | quote }}
+          image: {{ .Values.images.tags.db_drop | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

heat/templates/job-db-init.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-db-init
-          image: {{ .Values.images.db_init | quote }}
+          image: {{ .Values.images.tags.db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

heat/templates/job-db-sync.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-db-sync
-          image: {{ .Values.images.db_sync }}
+          image: {{ .Values.images.tags.db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

heat/templates/job-ks-endpoints.yaml

@@ -37,7 +37,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

heat/templates/job-ks-service.yaml

@@ -36,7 +36,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "orchestration" "cloudformation" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:

heat/templates/job-ks-user.yaml

@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
@@ -57,7 +57,7 @@ spec:
             - name: SERVICE_OS_ROLE
               value: {{ .Values.endpoints.identity.auth.user.role | quote }}
         - name: heat-ks-trustee-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ks-user.sh
@@ -78,7 +78,7 @@ spec:
             - name: SERVICE_OS_ROLE
               value: {{ .Values.endpoints.identity.auth.trustee.role | quote }}
         - name: heat-ks-domain-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           command:
             - /tmp/ks-domain-user.sh

heat/templates/job-trusts.yaml

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

heat/values.yaml

@@ -24,6 +24,7 @@ labels:
   node_selector_value: enabled
 
 images:
+  tags:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_sync: docker.io/kolla/ubuntu-source-heat-api:3.0.3

helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl

@@ -19,7 +19,7 @@ limitations under the License.
 {{- $deps := index . 1 -}}
 {{- $mounts := index . 2 -}}
 - name: init
-  image: {{ $envAll.Values.images.dep_check }}
+  image: {{ $envAll.Values.images.tags.dep_check }}
   imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
   env:
     - name: POD_NAME

horizon/templates/deployment.yaml

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

horizon/templates/job-db-drop.yaml

@@ -41,7 +41,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: horizon-db-drop
-          image: {{ .Values.images.db_drop }}
+          image: {{ .Values.images.tags.db_drop }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

horizon/templates/job-db-init.yaml

@@ -37,7 +37,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_horizon_db_init_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: horizon-db-init
-          image: {{ .Values.images.db_init }}
+          image: {{ .Values.images.tags.db_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:

horizon/templates/job-db-sync.yaml

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

horizon/values.yaml

@@ -18,6 +18,7 @@
 # name: value
 
 images:
+  tags:
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     db_sync: docker.io/kolla/ubuntu-source-horizon:4.0.0
     db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3