diff --git a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/deployment.yaml b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/deployment.yaml index ba15f17..c591009 100755 --- a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/deployment.yaml +++ b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/deployment.yaml @@ -40,6 +40,7 @@ spec: {{ tuple $envAll "fmapi" $mounts_fm_rest_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} containers: - name: fm-rest-api +{{ tuple $envAll $envAll.Values.pod.resources.fm | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} env: - name: RUNNING_IN_CONTAINER value: "True" @@ -74,8 +75,6 @@ spec: - name: http containerPort: 18003 protocol: TCP - resources: -{{ toYaml .Values.resources | indent 12 }} nodeSelector: {{ .Values.labels.fm_api.node_selector_key }}: {{ .Values.labels.fm_api.node_selector_value }} {{ if $envAll.Values.pod.tolerations.fm.enabled }} diff --git a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml index 63e2802..0ac1c6a 100644 --- a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml +++ b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml @@ -326,6 +326,14 @@ pod: fm: timeout: 30 resources: + enabled: false + fm: + requests: + memory: "128Mi" + cpu: "100m" + limits: + memory: "1024Mi" + cpu: "2000m" jobs: ks_endpoints: requests: