X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fso%2Fvalues.yaml;h=f7d74a347faf8718b868719a67de3d03e0c87335;hb=8f0179614f9621b4a5bfec2df2183306f3e34985;hp=4f64dac032740cdc6e8aaca2e19cbef60cfc25b6;hpb=ba34df1fd81ecb39176ac9d7ce84d1183fe34eba;p=oom.git

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 4f64dac032..f7d74a347f 100755
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -17,11 +17,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,6 +55,7 @@ global:
     siteName: onapheat
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
     defaultCloudOwner: onap
+
   client:
     certs:
       truststore: /app/client/org.onap.so.trust.jks
@@ -81,7 +77,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'
@@ -173,6 +173,8 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
+image: onap/so/api-handler-infra:1.7.11
+
 server:
   aaf:
     username: so@so.onap.org
@@ -191,26 +193,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
@@ -263,15 +257,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 +315,8 @@ so-catalog-db-adapter:
 
 so-cnf-adapter:
   enabled: true
+  db:
+    <<: *dbSecrets
   server:
     aafCredsExternalSecret: *aaf-secrets
     aaiCredsExternalSecret: *aai-secrets
@@ -383,7 +379,7 @@ so-sdnc-adapter:
     <<: *dbSecrets
 
 so-ve-vnfm-adapter:
-  enabled: true
+  enabled: false
 
 so-vfc-adapter:
   enabled: true
@@ -392,3 +388,4 @@ so-vfc-adapter:
 
 so-vnfm-adapter:
   enabled: true
+