From 7803346e64a1043a144540f58b6f1b65827670aa Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Tue, 28 Nov 2017 23:20:56 -0500
Subject: [PATCH] Images: Heat service specific explicit image names
This PS makes the service-specific images for Heat have
explicit names, allowing simple over-riding of images for an
entire site.
Change-Id: I36aff29746b8d402516033a9cc53fcb0c1e06fec
---
heat/templates/deployment-api.yaml | 2 +-
heat/templates/deployment-cfn.yaml | 2 +-
heat/templates/deployment-cloudwatch.yaml | 2 +-
heat/templates/deployment-engine.yaml | 2 +-
heat/templates/job-db-sync.yaml | 2 +-
heat/values.yaml | 10 +++++-----
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml
index 9e5cb3465f..d3d395e725 100644
--- 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.tags.api }}
+ image: {{ .Values.images.tags.heat_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/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml
index 909301d1bb..a296b4cbe0 100644
--- 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.tags.cfn }}
+ image: {{ .Values.images.tags.heat_cfn }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml
index 5a89967d64..b1dbbc45b7 100644
--- 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.tags.cloudwatch }}
+ image: {{ .Values.images.tags.heat_cloudwatch }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext:
diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml
index 686a66fe1d..9ac52dfd09 100644
--- 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.tags.engine }}
+ image: {{ .Values.images.tags.heat_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/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml
index ddd7cb6bed..4bb67884da 100644
--- 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.tags.db_sync }}
+ image: {{ .Values.images.tags.heat_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/heat/values.yaml b/heat/values.yaml
index 518d5ba2d1..b0e9c32794 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -27,15 +27,15 @@ 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
+ heat_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
+ heat_api: docker.io/kolla/ubuntu-source-heat-api:3.0.3
+ heat_cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3
+ heat_cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3
+ heat_engine: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pull_policy: "IfNotPresent"