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
This commit is contained in:
Tin Lam 2017-12-01 10:53:17 -06:00
parent 48a4d0cfba
commit 29abf7266d
4 changed files with 6 additions and 6 deletions

View File

@ -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:

View File

@ -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:

View File

@ -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:

View File

@ -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"