[SO] Cleanup of SO charts

[oom.git] / kubernetes / so / components / so-sdnc-adapter / values.yaml

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index b27c7e0..60c1f9b 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -22,12 +22,6 @@ global:
   #This configuration specifies Service and port for SDNC OAM interface
   sdncOamService: sdnc-oam
   sdncOamPort: 8282
-  security:
-    aaf:
-      enabled: false
-  aaf:
-    auth:
-      header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo=
   mariadbGalera:
     serviceName: mariadb-galera
     servicePort: '3306'
@@ -48,7 +42,16 @@ 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-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" . }}'
@@ -56,7 +59,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdnc-adapter:1.7.11
+image: onap/so/sdnc-adapter:1.11.0
 pullPolicy: Always
 
 org:
@@ -69,6 +72,10 @@ org:
           network:
             encryptionKey: 07a7159d3bf51a0e53be7a8f89699be7
 mso:
+  msoKey: 07a7159d3bf51a0e53be7a8f89699be7
+  #msoKeySecret: some secret
+  auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
+  #authSecret: some secret
   adapters:
     requestDb:
       auth: Basic YnBlbDpwYXNzd29yZDEk
@@ -87,26 +94,19 @@ containerPort: &containerPort 8086
 logPath: ./logs/sdnc/
 app: sdnc-adapter
 service:
-    type: ClusterIP
-    internalPort: *containerPort
-    externalPort: *containerPort
-    portName: so-sdnc-port
+  type: ClusterIP
+  ports:
+    - name: http
+      port: *containerPort
 updateStrategy:
-    type: RollingUpdate
-    maxUnavailable: 1
-    maxSurge: 1
-
+  type: RollingUpdate
+  maxUnavailable: 1
+  maxSurge: 1
 
 #################################################################
 # soHelpers part
 #################################################################
 soHelpers:
-  nameOverride: so-sdnc-cert-init
-  certInitializer:
-    nameOverride: so-sdnc-cert-init
-    credsPath: /opt/app/osaaf/local
-  cadi:
-    apiEnforcement: org.onap.so.sdncAdapterPerm
   containerPort: *containerPort
 
 # Resource Limit flavor -By Default using small
@@ -129,16 +129,27 @@ resources:
       cpu: 1000m
   unlimited: {}
 livenessProbe:
-    path: /manage/health
-    port: 8086
-    scheme: HTTP
-    initialDelaySeconds: 600
-    periodSeconds: 60
-    timeoutSeconds: 10
-    successThreshold: 1
-    failureThreshold: 3
+  path: /manage/health
+  port: 8086
+  scheme: HTTP
+  initialDelaySeconds: 600
+  periodSeconds: 60
+  timeoutSeconds: 10
+  successThreshold: 1
+  failureThreshold: 3
 ingress:
   enabled: false
 nodeSelector: {}
 tolerations: []
 affinity: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: so-sdnc-adapter
+  roles:
+    - read
+
+#Logs configuration
+log:
+  path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'