Merge "Images: Senlin service specific explicit image names"

This commit is contained in:
Zuul 2017-12-07 23:54:52 +00:00 committed by Gerrit Code Review
commit 2388ce4920
4 changed files with 6 additions and 6 deletions

View File

@ -44,7 +44,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_senlin_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: senlin-api
image: {{ .Values.images.tags.api }}
image: {{ .Values.images.tags.senlin_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: senlin-db-sync
image: {{ .Values.images.tags.db_sync }}
image: {{ .Values.images.tags.senlin_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_senlin_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: senlin-engine
image: {{ .Values.images.tags.engine }}
image: {{ .Values.images.tags.senlin_engine }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.engine | 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-senlin-api:3.0.3
senlin_db_sync: docker.io/kolla/ubuntu-source-senlin-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-senlin-api:3.0.3
engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3
senlin_api: docker.io/kolla/ubuntu-source-senlin-api:3.0.3
senlin_engine: docker.io/kolla/ubuntu-source-senlin-engine:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pull_policy: "IfNotPresent"