openstack/openstack-helm
Code Issues Proposed changes

Images: Heat service specific explicit image names

Browse Source 
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
This commit is contained in:
portdirect 2017-11-28 23:20:56 -05:00
parent f5a6a5dedc
commit 7803346e64
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat/templates/deployment-api.yaml
View File

@ -44,7 +44,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_heat_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-api - name: heat-api
image: {{ .Values.images.tags.api }} image: {{ .Values.images.tags.heat_api }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: securityContext:

2
heat/templates/deployment-cfn.yaml
View File

@ -44,7 +44,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_heat_cfn_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-cfn - name: heat-cfn
image: {{ .Values.images.tags.cfn }} image: {{ .Values.images.tags.heat_cfn }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.cfn | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: securityContext:

2
heat/templates/deployment-cloudwatch.yaml
View File

@ -44,7 +44,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_heat_cloudwatch_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-cloudwatch - name: heat-cloudwatch
image: {{ .Values.images.tags.cloudwatch }} image: {{ .Values.images.tags.heat_cloudwatch }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.cloudwatch | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: securityContext:

2
heat/templates/deployment-engine.yaml
View File

@ -52,7 +52,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies $mounts_heat_engine_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-engine - name: heat-engine
image: {{ .Values.images.tags.engine }} image: {{ .Values.images.tags.heat_engine }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.engine | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
securityContext: securityContext:

2
heat/templates/job-db-sync.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: heat-db-sync - name: heat-db-sync
image: {{ .Values.images.tags.db_sync }} image: {{ .Values.images.tags.heat_db_sync }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

10
heat/values.yaml
View File

@ -27,15 +27,15 @@ images:
tags: tags:
bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
db_init: 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 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_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
ks_service: 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 ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
api: docker.io/kolla/ubuntu-source-heat-api:3.0.3 heat_api: docker.io/kolla/ubuntu-source-heat-api:3.0.3
cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3 heat_cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3
cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3 heat_cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3
engine: docker.io/kolla/ubuntu-source-heat-engine: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 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"