Merge "[CCSDK/CDS] Bump CDS version for final Guilin release"

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

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index 0d3b392..de1918b 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -17,16 +17,13 @@
 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
     serviceName: mariadb-galera
-    servicePort: "3306"
+    servicePort: '3306'
+    service: mariadb-galera
+    internalPort: '3306'
     # mariadbRootPassword: secretpassword
     # rootPasswordExternalSecret: some secret
     #This flag allows SO to instantiate its own mariadb-galera cluster,
@@ -69,6 +66,10 @@ global:
     path: /etc/ssl/certs
     share_path: /usr/local/share/ca-certificates/
 
+readinessCheck:
+  wait_for:
+    - so-mariadb-config
+
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -87,7 +88,7 @@ secrets:
     passwordPolicy: required
     annotations:
       helm.sh/hook: pre-upgrade,pre-install
-      helm.sh/hook-weight: "0"
+      helm.sh/hook-weight: '0'
       helm.sh/hook-delete-policy: before-hook-creation
   - uid: db-user-creds
     name: &dbUserCredsSecretName '{{ include "common.release" . }}-so-db-user-creds'
@@ -103,7 +104,7 @@ secrets:
     login: '{{ .Values.dbCreds.adminName }}'
     password: '{{ .Values.dbCreds.adminPassword }}'
     passwordPolicy: generate
-  - uid: "so-onap-certs"
+  - uid: 'so-onap-certs'
     name: &so-certs '{{ include "common.release" . }}-so-certs'
     externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
     type: generic
@@ -140,8 +141,7 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
-repository: nexus3.onap.org:10001
-image: onap/so/api-handler-infra:1.6.4
+image: onap/so/api-handler-infra:1.7.10
 pullPolicy: Always
 replicaCount: 1
 minReadySeconds: 10
@@ -219,11 +219,11 @@ mariadb-galera:
 ingress:
   enabled: false
   service:
-    - baseaddr: "so.api"
-      name: "so"
+    - baseaddr: 'so.api'
+      name: 'so'
       port: 8080
   config:
-    ssl: "none"
+    ssl: 'none'
 
 mso:
   adapters:
@@ -246,7 +246,7 @@ mso:
     auth: basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
 
 so-appc-orchestrator:
-  enabled: true
+  enabled: false
   db:
     <<: *dbSecrets
 
@@ -261,6 +261,8 @@ so-catalog-db-adapter:
 
 so-etsi-nfvo-ns-lcm:
   enabled: true
+  db:
+    <<: *dbSecrets
 
 so-monitoring:
   enabled: true
@@ -286,7 +288,7 @@ so-sdnc-adapter:
     <<: *dbSecrets
 
 so-ve-vnfm-adapter:
-  enabled: true
+  enabled: false
 
 so-vfc-adapter:
   enabled: true