X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fsdnc%2Fvalues.yaml;h=dfad46ac796908228611b55985905cd6662031c8;hb=refs%2Fheads%2Fmaster;hp=328b5adffbddaf61a6c18d5d983dc7bf12946d80;hpb=13c91a3f135f4cd622c0f3b4019e284cc88b0ebf;p=oom.git

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 328b5adffb..8773abde9a 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -32,6 +32,8 @@ global:
     service: &mariadbService mariadb-galera
     internalPort: 3306
     nameOverride: &mariadbName mariadb-galera
+    # (optional) if localCluster=false and an external secret is used set this variable
+    #userRootSecret: <secretName>
 
 
 #################################################################
@@ -47,13 +49,18 @@ secrets:
     # override this secret using external one with the same field that is used
     # to pass this to subchart.
     externalSecret: '{{ .Values.global.mariadbGalera.localCluster |
-      ternary ((hasSuffix "sdnc-db-root-password" (index .Values "mariadb-galera" "rootUser" "externalSecret")) |
-                  ternary
-                    ""
-                    (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .))
-              (include "common.mariadb.secret.rootPassSecretName"
-                (dict "dot" .
-                      "chartName" .Values.global.mariadbGalera.nameOverride)) }}'
+      ternary (( hasSuffix "sdnc-db-root-password" (index .Values "mariadb-galera" "rootUser" "externalSecret")) |
+               ternary
+                  ""
+                  (tpl (default "" (index .Values "mariadb-galera" "rootUser" "externalSecret")) .)
+               )
+               ( (not (empty (default "" .Values.global.mariadbGalera.userRootSecret))) |
+                 ternary
+                   .Values.global.mariadbGalera.userRootSecret
+                   (include "common.mariadb.secret.rootPassSecretName"
+                     (dict "dot" . "chartName" .Values.global.mariadbGalera.nameOverride)
+                   )
+               ) }}'
     password: '{{ (index .Values "mariadb-galera" "rootUser" "password") }}'
   - uid: db-secret
     name: &dbSecretName '{{ include "common.release" . }}-sdnc-db-secret'
@@ -209,7 +216,7 @@ certificates:
 # application images
 
 pullPolicy: Always
-image: onap/sdnc-image:2.5.5
+image: onap/sdnc-image:3.1.0
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -309,8 +316,7 @@ config:
       maxGCPauseMillis: 100
       parallelGCThreads : 3
       numberGCLogFiles: 10
-      minMemory: 512m
-      maxMemory: 2048m
+      maxRAMPercentage: 70
       gcLogOptions: ""
       # Next line enables gc logging
       # gcLogOptions: "-Xlog:gc=trace:file={{.Values.config.odl.gcLogDir}}/gc-%t.log}:time,level,tags:filecount={{.Values.config.odl.javaOptions.numberGCLogFiles}}"
@@ -405,10 +411,25 @@ config:
 # Strimzi KafkaUser/Topic config on top level
 kafkaUser: *kafkaUser
 
+# Annotations to control the execution and deletion of the job
+# Can be used to delete a job before an Upgrade
+#
+# jobAnnotations:
+#   # In case of an ArgoCD deployment this Hook deletes the job before syncing
+#   argocd.argoproj.io/hook: Sync
+#   argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
+#
+#   # In case of an Helm/Flux deployment this Hook deletes the job
+#   # This is what defines this resource as a hook. Without this line, the
+#   # job is considered part of the release.
+#   "helm.sh/hook": "pre-upgrade,pre-rollback,post-install"
+#   "helm.sh/hook-delete-policy": "before-hook-creation"
+#   "helm.sh/hook-weight": "1"
 
 # dependency / sub-chart configuration
 network-name-gen:
   enabled: true
+
 mariadb-galera: &mariadbGalera
   nameOverride: &sdnc-db sdnc-db
   config: &mariadbGaleraConfig
@@ -437,21 +458,6 @@ mariadb-galera: &mariadbGalera
 cds:
   enabled: false
 
-dmaap-listener:
-  enabled: true
-  nameOverride: sdnc-dmaap-listener
-  mariadb-galera:
-    <<: *mariadbGalera
-    config:
-      <<: *mariadbGaleraConfig
-      mysqlDatabase: *sdncDbName
-  config:
-    sdncChartName: sdnc
-    dmaapPort: 3904
-    sdncPort: 8282
-    configDir: /opt/onap/sdnc/data/properties
-    odlCredsExternalSecret: *odlCredsSecretName
-
 ueb-listener:
   enabled: true
   mariadb-galera:
@@ -660,18 +666,18 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4.7Gi
+      cpu: "3"
+      memory: "8Gi"
     requests:
-      cpu: 1
-      memory: 4.7Gi
+      cpu: "1"
+      memory: "8Gi"
   large:
     limits:
-      cpu: 4
-      memory: 9.4Gi
+      cpu: "4"
+      memory: "10Gi"
     requests:
-      cpu: 2
-      memory: 9.4Gi
+      cpu: "2"
+      memory: "10Gi"
   unlimited: {}
 
 #Pods Service Account
@@ -683,3 +689,8 @@ serviceAccount:
 #Log configuration
 log:
   path: /var/log/onap
+
+readinessCheck:
+  wait_for:
+    services:
+      - '{{ include "common.mariadbService" . }}'