From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 7 Oct 2020 06:33:14 +0000 (+0000)
Subject: Merge "[SDC] Update pod limits and timeouts"
X-Git-Tag: 7.0.0~161
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2b8141540093abff451c4fd333028a47b03c9e0c;hp=-c;p=oom.git

Merge "[SDC] Update pod limits and timeouts"
---

2b8141540093abff451c4fd333028a47b03c9e0c
diff --combined kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
index 5efa20ec73,c423da97c1..a5d312f308
--- a/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/templates/deployment.yaml
@@@ -48,6 -48,13 +48,13 @@@ spec
                fieldPath: metadata.namespace
          image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+         resources:
+           limits:
+             cpu: 100m
+             memory: 100Mi
+           requests:
+             cpu: 3m
+             memory: 20Mi
        {{- if .Values.global.aafEnabled }}
        - name: {{ include "common.fullname" . }}-move-cert
          command:
@@@ -63,6 -70,13 +70,13 @@@
          volumeMounts: {{ include "common.certInitializer.volumeMount" . | nindent 10 }}
            - name: sdc-certs
              mountPath: /sdc-certs
+         resources:
+           limits:
+             cpu: 100m
+             memory: 100Mi
+           requests:
+             cpu: 3m
+             memory: 20Mi
        {{- end }}
        containers:
          - name: {{ include "common.name" . }}
@@@ -114,8 -128,8 +128,8 @@@
              readOnly: true
            {{- if .Values.global.aafEnabled }}
            - name: sdc-certs
 -            mountPath: /sdc-certs
 -            subpath: mycreds.prop
 +            mountPath: /sdc-certs/mycreds.prop
 +            subPath: mycreds.prop
            - name: sdc-certs
              mountPath: /var/lib/jetty/etc/{{ .Values.certInitializer.keystoreFile }}
              subPath: {{ .Values.certInitializer.keystoreFile }}
@@@ -123,8 -137,7 +137,7 @@@
              mountPath: /var/lib/jetty/etc/{{ .Values.certInitializer.truststoreFile }}
              subPath: {{ .Values.certInitializer.truststoreFile }}
            {{ end }}
-           resources:
- {{ include "common.resources" . | indent 12 }}
+           resources: {{ include "common.resources" . | nindent 12 }}
          {{- if .Values.nodeSelector }}
          nodeSelector:
  {{ toYaml .Values.nodeSelector | indent 10 }}
@@@ -145,6 -158,13 +158,13 @@@
              mountPath: /var/log/onap
            - name: {{ include "common.fullname" . }}-data-filebeat
              mountPath: /usr/share/filebeat/data
+           resources:
+             limits:
+               cpu: 100m
+               memory: 100Mi
+             requests:
+               cpu: 3m
+               memory: 20Mi
        volumes: {{ include "common.certInitializer.volumes" . | nindent 8 }}
          - name: {{ include "common.fullname" . }}-localtime
            hostPath: