From 9ea2358c7f7c2086d58c756696dfbcf3d15d3afa Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Tue, 27 Mar 2018 16:51:35 -0500 Subject: [PATCH] [398389] Resource limits for pod specs - Add resource specs to export_api_key job - Fix test resource limit indentation Change-Id: I53a2d7e5db1388484e452b0451c9117c27ea1162 --- charts/maas/templates/job-export-api-key.yaml | 1 + charts/maas/templates/tests/test-maas-api.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/maas/templates/job-export-api-key.yaml b/charts/maas/templates/job-export-api-key.yaml index 64ccd86..ffbee36 100644 --- a/charts/maas/templates/job-export-api-key.yaml +++ b/charts/maas/templates/job-export-api-key.yaml @@ -88,6 +88,7 @@ spec: containers: - name: exporter image: {{ .Values.images.tags.export_api_key }} +{{ tuple $envAll $envAll.Values.pod.resources.jobs.export_api_key | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} imagePullPolicy: {{ .Values.images.pull_policy }} env: - name: SECRET_NAMESPACE diff --git a/charts/maas/templates/tests/test-maas-api.yaml b/charts/maas/templates/tests/test-maas-api.yaml index 2218890..658f7e0 100644 --- a/charts/maas/templates/tests/test-maas-api.yaml +++ b/charts/maas/templates/tests/test-maas-api.yaml @@ -36,7 +36,7 @@ spec: key: 'token' image: {{ .Values.images.tags.maas_region }} imagePullPolicy: {{ .Values.images.pull_policy }} -{{ tuple . .Values.pod.resources.test | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }} +{{ tuple . .Values.pod.resources.test | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }} command: ["/tmp/maas-test.sh"] volumeMounts: - name: maas-bin