From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Fri, 25 Sep 2020 08:49:16 +0000 (+0000)
Subject: Merge "Use common.resources in aaf-sshsm-abrmd template"
X-Git-Tag: 7.0.0~214
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=be167f91329ee182024cf94a7a6870ddd24a787d;p=oom.git

Merge "Use common.resources in aaf-sshsm-abrmd template"
---

be167f91329ee182024cf94a7a6870ddd24a787d
diff --cc kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
index 9bb5937877,9b191895dd..e6ccf05e61
--- a/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sshsm/charts/aaf-sshsm-abrmd/templates/job.yaml
@@@ -48,9 -48,10 +48,9 @@@ spec
          - name: {{ include "common.fullname" . }}-tpmconfig
            mountPath: "/abrmd/cred/"
            readOnly: true
-         resources: {{ toYaml .Values.resources | nindent 10 }}
+         resources: {{ include "common.resources" . | nindent 10 }}
        {{- if .Values.nodeSelector }}
        nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
 -        {{- end -}}
          {{- if .Values.global.tpm.enabled }}
          {{ (printf "%s: \"%s\"" .Values.global.tpm.nodeLabel .Values.global.tpm.nodeLabelValue) }}
          {{- end -}}