From 29abf7266d7adb17e2f561945c5f99774ee48047 Mon Sep 17 00:00:00 2001
From: Tin Lam <tin@irrational.io>
Date: Fri, 1 Dec 2017 10:53:17 -0600
Subject: [PATCH] Images: Magnum service specific explicit image names

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

Change-Id: I6d1dfe6bbd5a0911cc176958b932aaaf31131620
---
 magnum/templates/deployment-api.yaml        | 2 +-
 magnum/templates/job-db-sync.yaml           | 2 +-
 magnum/templates/statefulset-conductor.yaml | 2 +-
 magnum/values.yaml                          | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml
index fc9fb4dd9d..2829b7a9ed 100644
--- a/magnum/templates/deployment-api.yaml
+++ b/magnum/templates/deployment-api.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_magnum_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: magnum-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.magnum_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/magnum/templates/job-db-sync.yaml b/magnum/templates/job-db-sync.yaml
index b27fa7a0b2..97bca51b22 100644
--- a/magnum/templates/job-db-sync.yaml
+++ b/magnum/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: magnum-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.magnum_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/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml
index f6bc9373d2..1e091fe2e8 100644
--- a/magnum/templates/statefulset-conductor.yaml
+++ b/magnum/templates/statefulset-conductor.yaml
@@ -40,7 +40,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_magnum_conductor_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: magnum-conductor
-          image: {{ .Values.images.tags.conductor }}
+          image: {{ .Values.images.tags.magnum_conductor }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.conductor | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/magnum/values.yaml b/magnum/values.yaml
index dfd24aaa27..238b8ab10c 100644
--- a/magnum/values.yaml
+++ b/magnum/values.yaml
@@ -27,13 +27,13 @@ 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-magnum-api:3.0.3
+    magnum_db_sync: docker.io/kolla/ubuntu-source-magnum-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-magnum-api:3.0.3
-    conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3
+    magnum_api: docker.io/kolla/ubuntu-source-magnum-api:3.0.3
+    magnum_conductor: docker.io/kolla/ubuntu-source-magnum-conductor:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"