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
2017-10-23 08:59:08 -05:00 · 2017-10-23 08:59:08 -05:00 · fe6107cf76
commit fe6107cf76
parent 3d75724318
204 changed files with 427 additions and 400 deletions
--- a/barbican/templates/deployment-api.yaml
+++ b/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:
--- a/barbican/templates/job-bootstrap.yaml
+++ b/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:
--- a/barbican/templates/job-db-drop.yaml
+++ b/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:
--- a/barbican/templates/job-db-init.yaml
+++ b/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:
--- a/barbican/templates/job-db-sync.yaml
+++ b/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:
--- a/barbican/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/barbican/templates/job-ks-service.yaml
+++ b/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:
--- a/barbican/templates/job-ks-user.yaml
+++ b/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:
--- a/barbican/templates/pod-test.yaml
+++ b/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 }}
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@ -17,16 +17,17 @@ labels:
 release_group: null

 images:
-  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
-  db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  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
+  tags:
+    bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    scripted_test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    db_init: docker.io/kolla/ubuntu-source-heat-engine: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
+    barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
  pull_policy: "IfNotPresent"

 pod:
--- a/ceilometer/templates/deployment-api.yaml
+++ b/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:
--- a/ceilometer/templates/deployment-central.yaml
+++ b/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:
--- a/ceilometer/templates/deployment-collector.yaml
+++ b/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:
--- a/ceilometer/templates/deployment-compute.yaml
+++ b/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:
--- a/ceilometer/templates/deployment-notification.yaml
+++ b/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:
--- a/ceilometer/templates/job-db-init-mongodb.yaml
+++ b/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:
--- a/ceilometer/templates/job-db-init.yaml
+++ b/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:
--- a/ceilometer/templates/job-db-sync.yaml
+++ b/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:
--- a/ceilometer/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/ceilometer/templates/job-ks-service.yaml
+++ b/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:
--- a/ceilometer/templates/job-ks-user.yaml
+++ b/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:
--- a/ceilometer/templates/pod-rally-test.yaml
+++ b/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:
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@ -38,19 +38,20 @@ labels:
    node_selector_value: enabled

 images:
-  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
-  db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3
-  ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3
-  central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3
-  collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3
-  compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3
-  notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+  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
+    db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3
+    ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    api: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3
+    central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3
+    collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3
+    compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3
+    notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  pull_policy: "IfNotPresent"

 network:
--- a/ceph/templates/daemonset-mon.yaml
+++ b/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:
--- a/ceph/templates/daemonset-osd.yaml
+++ b/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:
--- a/ceph/templates/deployment-mds.yaml
+++ b/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:
--- a/ceph/templates/deployment-moncheck.yaml
+++ b/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:
--- a/ceph/templates/deployment-rbd-provisioner.yaml
+++ b/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:
--- a/ceph/templates/deployment-rgw.yaml
+++ b/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:
--- a/ceph/templates/job-bootstrap.yaml
+++ b/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:
--- a/ceph/templates/job-keyring.yaml
+++ b/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:
--- a/ceph/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/ceph/templates/job-ks-service.yaml
+++ b/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:
--- a/ceph/templates/job-ks-user.yaml
+++ b/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:
--- a/ceph/templates/job-namespace-client-key-cleaner.yaml
+++ b/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:
--- a/ceph/templates/job-namespace-client-key.yaml
+++ b/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:
--- a/ceph/templates/job-storage-admin-keys.yaml
+++ b/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:
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@ -20,14 +20,15 @@ deployment:
  rgw_keystone_user_and_endpoints: false

 images:
-  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
-  bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-  daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
-  ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5
-  rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
+  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
+    bootstrap: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+    daemon: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
+    ceph_config_helper: docker.io/port/ceph-config-helper:v1.7.5
+    rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
  pull_policy: "IfNotPresent"

 labels:
--- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml
+++ b/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:
--- a/cinder/templates/deployment-api.yaml
+++ b/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:
--- a/cinder/templates/deployment-backup.yaml
+++ b/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:
--- a/cinder/templates/deployment-scheduler.yaml
+++ b/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:
--- a/cinder/templates/deployment-volume.yaml
+++ b/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:
--- a/cinder/templates/job-bootstrap.yaml
+++ b/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:
--- a/cinder/templates/job-db-drop.yaml
+++ b/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:
--- a/cinder/templates/job-db-init.yaml
+++ b/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:
--- a/cinder/templates/job-db-sync.yaml
+++ b/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:
--- a/cinder/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/cinder/templates/job-ks-service.yaml
+++ b/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:
--- a/cinder/templates/job-ks-user.yaml
+++ b/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:
--- a/cinder/templates/pod-rally-test.yaml
+++ b/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:
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@ -26,20 +26,21 @@ labels:
 release_group: null

 images:
-  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
-  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-cinder-api:3.0.3
-  bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
-  volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
-  volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
-  backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+  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
+    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-cinder-api:3.0.3
+    bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    scheduler: docker.io/kolla/ubuntu-source-cinder-scheduler:3.0.3
+    volume: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
+    volume_usage_audit: docker.io/kolla/ubuntu-source-cinder-volume:3.0.3
+    backup: docker.io/kolla/ubuntu-source-cinder-backup:3.0.3
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  pull_policy: "IfNotPresent"

 jobs:
--- a/dns-helper/templates/daemonset-dns-helper.yaml
+++ b/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
--- a/dns-helper/values.yaml
+++ b/dns-helper/values.yaml
@ -22,5 +22,6 @@ labels:
  node_selector_value: enabled

 images:
-  dns_helper: docker.io/ubuntu:16.04
+  tags:
+    dns_helper: docker.io/ubuntu:16.04
  pull_policy: "IfNotPresent"
--- a/etcd/templates/deployment.yaml
+++ b/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
--- a/etcd/values.yaml
+++ b/etcd/values.yaml
@ -18,7 +18,8 @@
 # name: value

 images:
-  etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5'
+  tags:
+    etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5'
  pull_policy: IfNotPresent

 labels:
--- a/glance/templates/deployment-api.yaml
+++ b/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:
--- a/glance/templates/deployment-registry.yaml
+++ b/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:
--- a/glance/templates/job-bootstrap.yaml
+++ b/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:
--- a/glance/templates/job-clean.yaml
+++ b/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:
--- a/glance/templates/job-db-drop.yaml
+++ b/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:
--- a/glance/templates/job-db-init.yaml
+++ b/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:
--- a/glance/templates/job-db-sync.yaml
+++ b/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:
--- a/glance/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/glance/templates/job-ks-service.yaml
+++ b/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:
--- a/glance/templates/job-ks-user.yaml
+++ b/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:
--- a/glance/templates/job-storage-init.yaml
+++ b/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:
--- a/glance/templates/pod-rally-test.yaml
+++ b/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:
--- a/glance/values.yaml
+++ b/glance/values.yaml
@ -27,19 +27,20 @@ labels:
 release_group: null

 images:
-  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
-  db_sync: docker.io/kolla/ubuntu-source-glance-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-glance-api:3.0.3
-  registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3
-  # Bootstrap image requires curl
-  bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+  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
+    db_sync: docker.io/kolla/ubuntu-source-glance-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-glance-api:3.0.3
+    registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3
+    # Bootstrap image requires curl
+    bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  pull_policy: "IfNotPresent"

 bootstrap:
--- a/gnocchi/templates/daemonset-metricd.yaml
+++ b/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:
--- a/gnocchi/templates/daemonset-statsd.yaml
+++ b/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:
--- a/gnocchi/templates/deployment-api.yaml
+++ b/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:
--- a/gnocchi/templates/job-db-init-indexer.yaml
+++ b/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:
--- a/gnocchi/templates/job-db-init-keystone.yaml
+++ b/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:
--- a/gnocchi/templates/job-db-sync.yaml
+++ b/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:
--- a/gnocchi/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/gnocchi/templates/job-ks-service.yaml
+++ b/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:
--- a/gnocchi/templates/job-ks-user.yaml
+++ b/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:
--- a/gnocchi/templates/job-storage-init.yaml
+++ b/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:
--- a/gnocchi/templates/pod-gnocchi-test.yaml
+++ b/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:
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@ -7,19 +7,20 @@ labels:
  node_selector_value: enabled

 images:
-  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
-  # using non-kolla images until kolla supports postgres as
-  # an indexer
-  db_init_keystone: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
-  db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
-  ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
-  statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3
-  metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3
+  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
+    # using non-kolla images until kolla supports postgres as
+    # an indexer
+    db_init_keystone: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
+    db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
+    ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    api: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
+    statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3
+    metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3
  pull_policy: "IfNotPresent"

 network:
--- a/heat/templates/deployment-api.yaml
+++ b/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:
--- a/heat/templates/deployment-cfn.yaml
+++ b/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:
--- a/heat/templates/deployment-cloudwatch.yaml
+++ b/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:
--- a/heat/templates/deployment-engine.yaml
+++ b/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:
--- a/heat/templates/job-bootstrap.yaml
+++ b/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:
--- a/heat/templates/job-db-drop.yaml
+++ b/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:
--- a/heat/templates/job-db-init.yaml
+++ b/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:
--- a/heat/templates/job-db-sync.yaml
+++ b/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:
--- a/heat/templates/job-ks-endpoints.yaml
+++ b/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:
--- a/heat/templates/job-ks-service.yaml
+++ b/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:
--- a/heat/templates/job-ks-user.yaml
+++ b/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
--- a/heat/templates/job-trusts.yaml
+++ b/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:
--- a/heat/values.yaml
+++ b/heat/values.yaml
@ -24,18 +24,19 @@ labels:
  node_selector_value: enabled

 images:
-  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
-  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-heat-api:3.0.3
-  cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3
-  cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3
-  engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+  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
+    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-heat-api:3.0.3
+    cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3
+    cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3
+    engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  pull_policy: "IfNotPresent"

 conf:
--- a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl
+++ b/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
--- a/horizon/templates/deployment.yaml
+++ b/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:
--- a/horizon/templates/job-db-drop.yaml
+++ b/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:
--- a/horizon/templates/job-db-init.yaml
+++ b/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:
--- a/horizon/templates/job-db-sync.yaml
+++ b/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:
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@ -18,11 +18,12 @@
 # name: value

 images:
-  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
-  horizon: docker.io/kolla/ubuntu-source-horizon:4.0.0
-  dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
+  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
+    horizon: docker.io/kolla/ubuntu-source-horizon:4.0.0
+    dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
  pull_policy: "IfNotPresent"

 release_group: null
--- a/Show More
+++ b/Show More