diff options
| author |   krishnaa96 <krishna.moorthy6@wipro.com> | 2021-03-10 12:02:52 +0530 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-03-20 11:51:05 +0000 |
| commit | 2652e5198b438818968bbd15e30dff1b6993c301 (patch) | |
| tree | 58f07a53e4b53f5ae73c99f203fe41166187be0a /kubernetes/aaf/components | |
| parent | fde94076e689727e8a2c3c5147ce1242dc225f87 (diff) | |
[OOF] Update containers to latest versions
- OSDF: 3.0.4
- Fixed NST selection response
- HAS: 2.1.4
- Fixed SDC interface
- Fixed weak cryptography issues
- CMSO: 2.3.2
- Fixed weak cryptography issues
Chart changes
- Remove encrypted password from
CMSO and move it to k8s secret
Issue-ID: OPTFRA-917
Signed-off-by: Krishna Moorthy <krishna.moorthy6@wipro.com>
Change-Id: I1cf272f66f76412d5042fdf3ed3bcf1d461ab254
Diffstat (limited to 'kubernetes/aaf/components')
| -rw-r--r-- | kubernetes/aaf/components/aaf-sms/resources/config/has.json | 7 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-sms/templates/job.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-sms/values.yaml | 9 |
3 files changed, 21 insertions, 1 deletions
diff --git a/kubernetes/aaf/components/aaf-sms/resources/config/has.json b/kubernetes/aaf/components/aaf-sms/resources/config/has.json index 679b5189de..ef42ce98d3 100644 --- a/kubernetes/aaf/components/aaf-sms/resources/config/has.json +++ b/kubernetes/aaf/components/aaf-sms/resources/config/has.json @@ -38,6 +38,13 @@ "password": "${AAF_PASS}", "aaf_conductor_user": "oof@oof.onap.org" } + }, + { + "name": "sdc", + "values": { + "username": "${SDC_USER}", + "password": "${SDC_PASS}" + } } ] } diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml index 1341889af3..6e50620a99 100644 --- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml +++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml @@ -51,6 +51,7 @@ spec: export OSDF_PCI_OPT_PASS=${OSDF_PCI_OPT_PASS_PLAIN}; export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN}; export SO_PASS=${SO_PASS_PLAIN}; + export SDC_PASS=${SDC_PASS_PLAIN}; cd /config-input; for PFILE in `find . -not -type d | grep -v -F ..`; do envsubst <${PFILE} >/config/${PFILE}; @@ -131,6 +132,11 @@ spec: - name: SO_PASS_PLAIN {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-creds" "key" "password") | indent 10 }} + - name: SDC_USER + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "login") | indent 10 }} + - name: SDC_PASS_PLAIN + {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "password") | indent 10 }} + volumeMounts: - mountPath: /config-input name: {{ include "common.name" . }}-preload-input diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml index 3b777c64f6..ab7d8fb71b 100644 --- a/kubernetes/aaf/components/aaf-sms/values.yaml +++ b/kubernetes/aaf/components/aaf-sms/values.yaml @@ -192,7 +192,11 @@ secrets: login: '{{ .Values.oofCreds.soUsername }}' password: '{{ .Values.oofCreds.soPassword }}' passwordPolicy: required - + - uid: sdc-creds + type: basicAuth + login: '{{ .Values.oofCreds.sdcUsername }}' + password: '{{ .Values.oofCreds.sdcPassword }}' + passwordPolicy: required oofCreds: aaiUsername: oof@oof.onap.org aaiPassword: demo123456! @@ -239,6 +243,9 @@ oofCreds: soUsername: apihBpmn soPassword: password1$ + sdcUsername: aai + sdcPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U + # Configure resource requests and limits resources: small: |