From a2e8188b81bd79516319815de3e9c81e4d4b95f9 Mon Sep 17 00:00:00 2001
From: Scott Hussey <sh8121@att.com>
Date: Mon, 30 Oct 2017 13:02:53 -0500
Subject: [PATCH] Fix templates for new images structure

Update manifest templates to correctly use the new images
structure.

Change-Id: I1b88fc064069f0bf7d768df808caec923b58b8ce
---
 charts/maas/templates/deployment-rack.yaml          | 2 +-
 charts/maas/templates/job-bootstrap-admin-user.yaml | 2 +-
 charts/maas/templates/job-db-init.yaml              | 2 +-
 charts/maas/templates/job-db-sync.yaml              | 2 +-
 charts/maas/templates/job-export-api-key.yaml       | 2 +-
 charts/maas/templates/job-import.yaml               | 2 +-
 charts/maas/templates/statefulset-region.yaml       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/maas/templates/deployment-rack.yaml b/charts/maas/templates/deployment-rack.yaml
index dfb7f43..83c4260 100644
--- a/charts/maas/templates/deployment-rack.yaml
+++ b/charts/maas/templates/deployment-rack.yaml
@@ -47,7 +47,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: maas-rack
-          image: {{ .Values.images.maas_rack }}
+          image: {{ .Values.images.tags.maas_rack }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           env:
             - name: MAAS_ENDPOINT
diff --git a/charts/maas/templates/job-bootstrap-admin-user.yaml b/charts/maas/templates/job-bootstrap-admin-user.yaml
index adc7b92..fff82f8 100644
--- a/charts/maas/templates/job-bootstrap-admin-user.yaml
+++ b/charts/maas/templates/job-bootstrap-admin-user.yaml
@@ -34,7 +34,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: maas-bootstrap-admin-user
-          image: {{ .Values.images.bootstrap }}
+          image: {{ .Values.images.tags.bootstrap }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap_admin_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/charts/maas/templates/job-db-init.yaml b/charts/maas/templates/job-db-init.yaml
index 8e68e0c..4672e44 100644
--- a/charts/maas/templates/job-db-init.yaml
+++ b/charts/maas/templates/job-db-init.yaml
@@ -34,7 +34,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: maas-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:
diff --git a/charts/maas/templates/job-db-sync.yaml b/charts/maas/templates/job-db-sync.yaml
index 0bd4a55..f7adc32 100644
--- a/charts/maas/templates/job-db-sync.yaml
+++ b/charts/maas/templates/job-db-sync.yaml
@@ -34,7 +34,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: maas-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:
diff --git a/charts/maas/templates/job-export-api-key.yaml b/charts/maas/templates/job-export-api-key.yaml
index 44367df..6318424 100644
--- a/charts/maas/templates/job-export-api-key.yaml
+++ b/charts/maas/templates/job-export-api-key.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies $initMounts | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: exporter
-          image: {{ .Values.images.export_api_key }}
+          image: {{ .Values.images.tags.export_api_key }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           env:
             - name: SECRET_NAMESPACE
diff --git a/charts/maas/templates/job-import.yaml b/charts/maas/templates/job-import.yaml
index b22ddc1..d607825 100644
--- a/charts/maas/templates/job-import.yaml
+++ b/charts/maas/templates/job-import.yaml
@@ -34,7 +34,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: region-import-resources
-          image: {{ .Values.images.maas_region }}
+          image: {{ .Values.images.tags.maas_region }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           env:
             - name: JOB_TIMEOUT
diff --git a/charts/maas/templates/statefulset-region.yaml b/charts/maas/templates/statefulset-region.yaml
index e31a3fb..a4d9b45 100644
--- a/charts/maas/templates/statefulset-region.yaml
+++ b/charts/maas/templates/statefulset-region.yaml
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_maas_region_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
       - name: maas-region
-        image: {{ .Values.images.maas_region }}
+        image: {{ .Values.images.tags.maas_region }}
         imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.maas_region | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
         ports: