Merge "[SO] Update SO images to 1.7.12" into guilin

[oom.git] / kubernetes / so / values.yaml

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 4648015..22828ba 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -60,6 +60,7 @@ global:
     siteName: onapheat
     auth: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
     defaultCloudOwner: onap
+
   client:
     certs:
       truststore: /app/client/org.onap.so.trust.jks
@@ -70,6 +71,10 @@ global:
     path: /etc/ssl/certs
     share_path: /usr/local/share/ca-certificates/
 
+readinessCheck:
+  wait_for:
+    - so-mariadb-config
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -169,6 +174,10 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
+
+repository: nexus3.onap.org:10001
+image: onap/so/api-handler-infra:1.7.12
+
 server:
   aaf:
     username: so@so.onap.org
@@ -187,26 +196,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
@@ -300,7 +301,7 @@ mso:
     auth: basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
 
 so-appc-orchestrator:
-  enabled: true
+  enabled: false
   server:
     actuatorCredsExternalSecret: *actuator-secrets
   db:
@@ -317,6 +318,8 @@ so-catalog-db-adapter:
 
 so-cnf-adapter:
   enabled: true
+  db:
+    <<: *dbSecrets
   server:
     aafCredsExternalSecret: *aaf-secrets
     aaiCredsExternalSecret: *aai-secrets
@@ -379,7 +382,7 @@ so-sdnc-adapter:
     <<: *dbSecrets
 
 so-ve-vnfm-adapter:
-  enabled: true
+  enabled: false
 
 so-vfc-adapter:
   enabled: true
@@ -388,3 +391,4 @@ so-vfc-adapter:
 
 so-vnfm-adapter:
   enabled: true
+