From 197b79592d7a905d7fe29f2a545c7a299a05472c Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 1 Dec 2017 11:07:06 -0600
Subject: [PATCH] Images: Mistral service specific explicit image names

This patch set makes the service-specific images for mistral
have explicit names, allowing simple over-riding of images
for an entire site.

Change-Id: I49a105a29660bbcc500e31352d639389f5636ed5
---
 mistral/templates/deployment-api.yaml           |  2 +-
 mistral/templates/deployment-executor.yaml      |  2 +-
 mistral/templates/job-db-sync.yaml              |  2 +-
 mistral/templates/statefulset-engine.yaml       |  2 +-
 mistral/templates/statefulset-event-engine.yaml |  2 +-
 mistral/values.yaml                             | 10 +++++-----
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml
index 93972f5b21..08b0f095b1 100644
--- a/mistral/templates/deployment-api.yaml
+++ b/mistral/templates/deployment-api.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_mistral_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.mistral_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml
index 294e3c1e3b..63f65948db 100644
--- a/mistral/templates/deployment-executor.yaml
+++ b/mistral/templates/deployment-executor.yaml
@@ -43,7 +43,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_mistral_executor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-executor
-          image: {{ .Values.images.tags.executor }}
+          image: {{ .Values.images.tags.mistral_executor }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.executor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/mistral/templates/job-db-sync.yaml b/mistral/templates/job-db-sync.yaml
index 830115fce1..d3846f3c12 100644
--- a/mistral/templates/job-db-sync.yaml
+++ b/mistral/templates/job-db-sync.yaml
@@ -36,7 +36,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.mistral_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/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml
index a96be01d03..44fcca4f8a 100644
--- a/mistral/templates/statefulset-engine.yaml
+++ b/mistral/templates/statefulset-engine.yaml
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_mistral_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-engine
-          image: {{ .Values.images.tags.engine }}
+          image: {{ .Values.images.tags.mistral_engine }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml
index e31c4ef045..afab9a646c 100644
--- a/mistral/templates/statefulset-event-engine.yaml
+++ b/mistral/templates/statefulset-event-engine.yaml
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_mistral_event_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-event-engine
-          image: {{ .Values.images.tags.event_engine }}
+          image: {{ .Values.images.tags.mistral_event_engine }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.event_engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/mistral/values.yaml b/mistral/values.yaml
index 4ac59d53f2..aa76fa9e72 100644
--- a/mistral/values.yaml
+++ b/mistral/values.yaml
@@ -28,15 +28,15 @@ images:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3
+    mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-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-mistral-api:3.0.3
-    engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3
-    event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3
-    executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3
+    mistral_api: docker.io/kolla/ubuntu-source-mistral-api:3.0.3
+    mistral_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3
+    mistral_event_engine: docker.io/kolla/ubuntu-source-mistral-engine:3.0.3
+    mistral_executor: docker.io/kolla/ubuntu-source-mistral-executor:3.0.3
   pull_policy: "IfNotPresent"
 
 network: