aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/so
diff options
context:
space:
mode:
authorseshukm <seshu.kumar.m@huawei.com>2021-03-19 02:57:36 +0530
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-03-26 14:50:53 +0100
commit610d97d1dd0182f20e0ec7a13cec263a78d1374c (patch)
tree7447414f121e745b5a91b63e38cfa6da9a45a029 /kubernetes/so
parent75a52ff6aa54884e3b79e538c77d64caacdce6ba (diff)
[SO] SDNC-adapter missing properties for the latest changes
Adding the missing oom properties for the sdnc adapter. Issue-ID: SO-3590 Signed-off-by: seshukm <seshu.kumar.m@huawei.com> Change-Id: Id114848c88329db8317695391142483a43d1b6fb
Diffstat (limited to 'kubernetes/so')
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml5
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml6
-rwxr-xr-xkubernetes/so/components/so-sdnc-adapter/values.yaml22
-rwxr-xr-xkubernetes/so/values.yaml2
4 files changed, 34 insertions, 1 deletions
diff --git a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
index 3c6e0ab305..0971b4f0db 100755
--- a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -16,6 +16,8 @@
server:
port: {{ index .Values.containerPort }}
mso:
+ msoKey: ${MSO_KEY}
+ auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" "${AAF_AUTH}" "value2" "${MSO_AUTH}" )}}
async:
core-pool-size: 50
max-pool-size: 50
@@ -30,6 +32,9 @@ mso:
db:
auth: {{ include "so.helpers.profileProperty" (dict "condition" .Values.global.security.aaf.enabled "value1" .Values.global.aaf.auth.header "value2" .Values.mso.adapters.requestDb.auth )}}
site-name: onapheat
+ #needs to be confirmed TODO
+ workflow:
+ endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
org:
onap:
so:
diff --git a/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml b/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
index 5a98828c1a..7b32cb6050 100755
--- a/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/templates/deployment.yaml
@@ -69,6 +69,12 @@ spec:
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "login") | indent 10 }}
- name: DB_ADMIN_PASSWORD
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "password") | indent 10 }}
+ - name: MSO_KEY
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnc-adapter-mso-key" "key" "password") | indent 10 }}
+ - name: MSO_AUTH
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnc-adapter-mso-auth" "key" "password") | indent 10 }}
+ - name: AAF_AUTH
+ {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdnc-adapter-aaf-auth" "key" "password") | indent 10 }}
{{ include "so.certificates.env" . | indent 8 | trim }}
envFrom:
- configMapRef:
diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index b27c7e051f..7df53dc6a1 100755
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -28,6 +28,8 @@ global:
aaf:
auth:
header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo=
+ encrypted: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
+ #encryptedSecret: some secret
mariadbGalera:
serviceName: mariadb-galera
servicePort: '3306'
@@ -48,7 +50,21 @@ secrets:
login: '{{ .Values.db.adminName }}'
password: '{{ .Values.db.adminPassword }}'
passwordPolicy: required
-
+ - uid: sdnc-adapter-mso-key
+ name: '{{ include "common.release" . }}-so-sdnc-mso-key'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.mso.msoKeySecret) . }}'
+ password: '{{ .Values.mso.msoKey }}'
+ - uid: sdnc-adapter-aaf-auth
+ name: '{{ include "common.release" . }}-so-sdnc-aaf-auth'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.global.aaf.auth.encryptedSecret) . }}'
+ password: '{{ .Values.global.aaf.auth.encrypted }}'
+ - uid: sdnc-adapter-mso-auth
+ name: '{{ include "common.release" . }}-so-sdnc-mso-auth'
+ type: password
+ externalSecret: '{{ tpl (default "" .Values.mso.authSecret) . }}'
+ password: '{{ .Values.mso.auth }}'
#secretsFilePaths: |
# - 'my file 1'
# - '{{ include "templateThatGeneratesFileName" . }}'
@@ -69,6 +85,10 @@ org:
network:
encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
mso:
+ msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+ #msoKeySecret: some secret
+ auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
+ #authSecret: some secret
adapters:
requestDb:
auth: Basic YnBlbDpwYXNzd29yZDEk
diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 6bd6e26885..5d3957aac1 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -365,6 +365,8 @@ so-sdnc-adapter:
enabled: true
db:
<<: *dbSecrets
+ mso:
+ msoKeySecret: *mso-key
so-ve-vnfm-adapter:
enabled: false