airship/maas
Code Issues Proposed changes

Fix templates for new images structure

Browse Source 
Update manifest templates to correctly use the new images
structure.

Change-Id: I1b88fc064069f0bf7d768df808caec923b58b8ce
This commit is contained in:
Scott Hussey 2017-10-30 13:02:53 -05:00
parent 8beae2fb84
commit a2e8188b81
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/maas/templates/deployment-rack.yaml
View File

@ -47,7 +47,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: maas-rack
image: {{ .Values.images.maas_rack }}
image: {{ .Values.images.tags.maas_rack }}
imagePullPolicy: {{ .Values.images.pull_policy }}
env:
- name: MAAS_ENDPOINT

2
charts/maas/templates/job-bootstrap-admin-user.yaml
View File

@ -34,7 +34,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: maas-bootstrap-admin-user
image: {{ .Values.images.bootstrap }}
image: {{ .Values.images.tags.bootstrap }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap_admin_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env:

2
charts/maas/templates/job-db-init.yaml
View File

@ -34,7 +34,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: maas-db-init
image: {{ .Values.images.db_init | quote }}
image: {{ .Values.images.tags.db_init | quote }}
imagePullPolicy: {{ .Values.images.pull_policy | quote }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env:

2
charts/maas/templates/job-db-sync.yaml
View File

@ -34,7 +34,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: maas-db-sync
image: {{ .Values.images.db_sync }}
image: {{ .Values.images.tags.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:

2
charts/maas/templates/job-export-api-key.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies $initMounts | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: exporter
image: {{ .Values.images.export_api_key }}
image: {{ .Values.images.tags.export_api_key }}
imagePullPolicy: {{ .Values.images.pull_policy }}
env:
- name: SECRET_NAMESPACE

2
charts/maas/templates/job-import.yaml
View File

@ -34,7 +34,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: region-import-resources
image: {{ .Values.images.maas_region }}
image: {{ .Values.images.tags.maas_region }}
imagePullPolicy: {{ .Values.images.pull_policy }}
env:
- name: JOB_TIMEOUT

2
charts/maas/templates/statefulset-region.yaml
View File

@ -40,7 +40,7 @@ spec:
{{ tuple $envAll $dependencies $mounts_maas_region_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers:
- name: maas-region
image: {{ .Values.images.maas_region }}
image: {{ .Values.images.tags.maas_region }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.maas_region | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
ports: