airship/shipyard
Code Issues Proposed changes

[398226] Add Resource limits for ks_service job

Browse Source 
Checks on Shipyard/Airflow chart show that we are missing the
resource limits for ks_service job.

This patch set will add the resource limits and will also update
indentation for 'test-airflow-api' and 'test-shipyard-api'.

Change-Id: I0a3f11bb9cbb45a9c8994dbc226c080914a86a1c
This commit is contained in:
Anthony Lin 2018-03-28 06:15:42 +00:00 committed by Scott Hussey
parent 0a7b2c2783
commit d40e9776d3
3 changed files with 3 additions and 2 deletions

1
charts/shipyard/templates/job-ks-service.yaml

@ -41,6 +41,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:

2
charts/shipyard/templates/tests/test-airflow-api.yaml

@ -32,7 +32,7 @@ spec:
value: {{ tuple "airflow_web" "internal" "airflow_web" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }}
image: {{ .Values.images.tags.airflow }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple . .Values.pod.resources.test.airflow | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
{{ tuple . .Values.pod.resources.test.airflow | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
command: ["/bin/bash", "-c", "curl -v -X GET --fail ${AIRFLOW_URL}/admin/rest_api/api?api=version; exit $?"]
...
{{- end }}

2
charts/shipyard/templates/tests/test-shipyard-api.yaml

@ -32,7 +32,7 @@ spec:
value: {{ tuple "shipyard" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }}
image: {{ .Values.images.tags.shipyard }}
imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple . .Values.pod.resources.test.shipyard | include "helm-toolkit.snippets.kubernetes_resources" | indent 8 }}
{{ tuple . .Values.pod.resources.test.shipyard | include "helm-toolkit.snippets.kubernetes_resources" | indent 6 }}
command: ["/bin/bash", "-c", "curl -v -X GET --fail ${SHIPYARD_URL}/api/v1.0/health; exit $?"]
...
{{- end }}