From 12650c7909cf813e1a7994107164252b79e42b40 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Tue, 27 Mar 2018 15:28:43 -0500 Subject: [PATCH] [398387] Resource limits for ks_service job - Add resource limits to the Pod spec for the ks_service job Change-Id: I107d8108298282431fe767d7e05aad7ae9486eec --- charts/drydock/templates/job-ks-service.yaml | 1 + charts/drydock/templates/tests/test-drydock-api.yaml | 2 +- charts/drydock/templates/tests/test-drydock-auth.yaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/charts/drydock/templates/job-ks-service.yaml b/charts/drydock/templates/job-ks-service.yaml index b7158ae9..a9598ad5 100755 --- a/charts/drydock/templates/job-ks-service.yaml +++ b/charts/drydock/templates/job-ks-service.yaml @@ -42,6 +42,7 @@ spec: - name: {{ $osServiceType }}-ks-service-registration image: {{ $envAll.Values.images.tags.ks_service }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }} +{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} command: - /tmp/ks-service.sh volumeMounts: diff --git a/charts/drydock/templates/tests/test-drydock-api.yaml b/charts/drydock/templates/tests/test-drydock-api.yaml index 0e76f569..f55d52d3 100644 --- a/charts/drydock/templates/tests/test-drydock-api.yaml +++ b/charts/drydock/templates/tests/test-drydock-api.yaml @@ -31,7 +31,7 @@ spec: value: {{ tuple "physicalprovisioner" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }} image: {{ .Values.images.tags.drydock }} 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: ["/bin/bash", "-c", "curl -v -X GET --fail ${DRYDOCK_URL}/api/v1.0/health; exit $?"] ... {{- end }} diff --git a/charts/drydock/templates/tests/test-drydock-auth.yaml b/charts/drydock/templates/tests/test-drydock-auth.yaml index 1c0e4e89..bc5d0b2b 100644 --- a/charts/drydock/templates/tests/test-drydock-auth.yaml +++ b/charts/drydock/templates/tests/test-drydock-auth.yaml @@ -32,7 +32,7 @@ spec: value: {{ tuple "physicalprovisioner" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }} image: {{ .Values.images.tags.drydock }} 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: ["/bin/bash", "-c", "curl -v -X GET --fail ${DRYDOCK_URL}/api/v1.0/tasks; exit $?"] ... {{- end }}