X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fvalues.yaml;h=1358795cecc75621c5b19ecab1f2bc68c39544d9;hb=2c01fdf6aa282fbdae79de83b372302ec51d092b;hp=4f64dac032740cdc6e8aaca2e19cbef60cfc25b6;hpb=7db43001320bae15cb20b051914d4648731d546a;p=oom.git

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 4f64dac032..1358795cec 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2018 AT&T USA
 # Copyright © 2020 Huawei
+# Copyright © 2021 Orange
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -17,11 +18,6 @@
 global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
-  repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  soBaseImage: onap/so/base-image:1.0
   aafAgentImage: onap/aaf/aaf_agent:2.1.20
   mariadbGalera:
     nameOverride: mariadb-galera
@@ -60,12 +56,7 @@ global:
     siteName: onapheat
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
     defaultCloudOwner: onap
-  client:
-    certs:
-      truststore: /app/client/org.onap.so.trust.jks
-      keystore: /app/client/org.onap.so.jks
-      trustStorePassword: LHN4Iy5DKlcpXXdWZ0pDNmNjRkhJIzpI
-      keyStorePassword: c280b25hcA==
+
   certificates:
     path: /etc/ssl/certs
     share_path: /usr/local/share/ca-certificates/
@@ -81,7 +72,11 @@ secrets:
   - uid: db-root-pass
     name: &dbRootPassSecretName '{{ include "common.release" . }}-so-db-root-pass'
     type: password
-    externalSecret: '{{ ternary .Values.global.mariadbGalera.rootPasswordExternalSecret (default (include "common.mariadb.secret.rootPassSecretName" (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)) .Values.global.mariadbGalera.rootPasswordExternalSecret) .Values.global.mariadbGalera.localCluster }}'
+    externalSecret: '{{ .Values.global.mariadbGalera.localCluster | ternary
+      .Values.global.mariadbGalera.rootPasswordExternalSecret
+      (default (include "common.mariadb.secret.rootPassSecretName"
+        (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride))
+        .Values.global.mariadbGalera.rootPasswordExternalSecret)  }}'
     password: '{{ .Values.global.mariadbGalera.mariadbRootpassword }}'
   - uid: db-backup-creds
     name: &dbBackupCredsSecretName '{{ include "common.release" . }}-so-db-backup-creds'
@@ -108,12 +103,6 @@ secrets:
     login: '{{ .Values.dbCreds.adminName }}'
     password: '{{ .Values.dbCreds.adminPassword }}'
     passwordPolicy: generate
-  - uid: 'so-onap-certs'
-    name: &so-certs '{{ include "common.release" . }}-so-certs'
-    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
-    type: generic
-    filePaths:
-      - resources/config/certificates/msb-ca.crt
   - uid: 'mso-key'
     name: &mso-key '{{ include "common.release" . }}-mso-key'
     type: password
@@ -173,6 +162,8 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
+image: onap/so/api-handler-infra:1.8.1
+
 server:
   aaf:
     username: so@so.onap.org
@@ -191,26 +182,18 @@ server:
     password: password1$
   # bpelCredsExternalSecret: some secret
 
-repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:1.6.4
 pullPolicy: Always
-
 replicaCount: 1
 minReadySeconds: 10
-
 containerPort: &containerPort 8080
-
 logPath: ./logs/apih/
-
 app: api-handler-infra
-
 service:
   type: NodePort
   nodePort: 77
   internalPort: *containerPort
   externalPort: *containerPort
   portName: so-apih-port
-
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 1
@@ -224,7 +207,6 @@ soHelpers:
   certInitializer:
     nameOverride: so-apih-cert-init
   credsPath: /opt/app/osaaf/local
-  certSecret: *so-certs
   containerPort: *containerPort
 
 # Resource Limit flavor -By Default using small
@@ -263,15 +245,15 @@ config:
 #                                                       --set so.global.mariadbGalera.nameOverride=so-mariadb-galera \
 #                                                       --set so.global.mariadbGalera.serviceName=so-mariadb-galera
 mariadb-galera:
-  config:
-    mariadbRootPasswordExternalSecret: *dbRootPassSecretName
-  nameOverride: so-mariadb-galera
+  rootUser:
+    externalSecret: *dbRootPassSecretName
+  nameOverride: &so-mariadb so-mariadb-galera
   replicaCount: 1
-  service:
-    name: so-mariadb-galera
   persistence:
     mountSubPath: so/mariadb-galera/data
     enabled: true
+  serviceAccount:
+    nameOverride: *so-mariadb
 
 ingress:
   enabled: false
@@ -321,6 +303,8 @@ so-catalog-db-adapter:
 
 so-cnf-adapter:
   enabled: true
+  db:
+    <<: *dbSecrets
   server:
     aafCredsExternalSecret: *aaf-secrets
     aaiCredsExternalSecret: *aai-secrets
@@ -341,7 +325,7 @@ so-mariadb:
     userCredsExternalSecret: *dbUserCredsSecretName
     adminCredsExternalSecret: *dbAdminCredsSecretName
 
-so-monitoring:
+so-admin-cockpit:
   enabled: true
   db:
     <<: *dbSecrets
@@ -381,14 +365,16 @@ so-sdnc-adapter:
   enabled: true
   db:
     <<: *dbSecrets
+  mso:
+    msoKeySecret: *mso-key
 
 so-ve-vnfm-adapter:
-  enabled: true
+  enabled: false
 
-so-vfc-adapter:
+so-etsi-sol005-adapter:
   enabled: true
   db:
     <<: *dbSecrets
 
-so-vnfm-adapter:
+so-etsi-sol003-adapter:
   enabled: true