X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fcomponents%2Fdmaap-dr-prov%2Fvalues.yaml;h=80b15c7063a7b3e61a8ac7972229bd260fa5550b;hb=555db9c1f910db06341070941b466e6c05827e27;hp=195bcb47be7a2a88c599926a1bc2017b3dbd0e84;hpb=efa45c96126380016456fb2ae4f9acdc4166751b;p=oom.git

diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
index 195bcb47be..af855c7640 100644
--- a/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-prov/values.yaml
@@ -16,21 +16,31 @@
 # Global configuration defaults.
 #################################################################
 global:
-  nodePortPrefix: 302
-  loggingDirectory: /opt/app/datartr/logs
+  mariadbGalera: &mariadbGalera
+    #This flag allows DMAAP-DR to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
+
+#################################################################
+# Secrets metaconfig
+#################################################################
+secrets:
+  - name: &dbUserSecretName '{{ include "common.release" . }}-dmaap-dr-db-user-credentials'
+    uid: 'dmaap-dr-db-user-credentials'
+    type: basicAuth
+    externalSecret: '{{ ternary "" (tpl (default "" (index .Values "mariadb-galera" "db" "externalSecret")) .) (hasSuffix "dmaap-dr-db-user-credentials" (index .Values "mariadb-galera" "db" "externalSecret"))}}'
+    login: '{{ index .Values "mariadb-galera" "db" "user" }}'
+    password: '{{ index .Values "mariadb-galera" "db" "password" }}'
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/dmaap/datarouter-prov:2.1.2
+image: onap/dmaap/datarouter-prov:2.1.13
 pullPolicy: Always
 
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# application configuration - see parent values chart
-
 # default number of instances
 replicaCount: 1
 
@@ -38,76 +48,99 @@ nodeSelector: {}
 
 affinity: {}
 
+containerPort: &svc_port 8080
+
+service:
+  type: ClusterIP
+  name: dmaap-dr-prov
+  ports:
+    - name: &port http
+      port: *svc_port
+
+ingress:
+  enabled: false
+  service:
+    - baseaddr: "dmaap-dr-prov-api"
+      name: "dmaap-dr-prov"
+      port: *svc_port
+  config:
+    ssl: "redirect"
+
+readinessCheck:
+  wait_for:
+    jobs:
+      - '{{ include "common.release" . }}-dmaap-dr-mariadb-init-config-job'
+
+# dr uses the EELF Logging framework https://github.com/att/EELF
+# and supports the following log levels: TRACE, DEBUG, INFO, WARN, ERROR, OFF
+logLevel: "DEBUG"
+
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 30
+  initialDelaySeconds: 60
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
+  port: *svc_port
 
 readiness:
-  initialDelaySeconds: 30
+  initialDelaySeconds: 60
   periodSeconds: 10
+  port: *svc_port
 
-## Persist data to a persitent volume
-persistence:
-  enabled: false
+# mariadb-galera configuration
+mariadb-galera:
+  nameOverride: &dbServer dmaap-dr-db
+  replicaCount: 1
+  db:
+    name: &mysqlDbName datarouter
+    user: datarouter
+    # password:
+    externalSecret: *dbUserSecretName
+  service:
+    name: *dbServer
+  nfsprovisionerPrefix: dmaap-dr-db
+  persistence:
+    size: 1Gi
+    mountSubPath: data-router/dr-db-data
+  serviceAccount:
+    nameOverride: *dbServer
 
-ingress:
-  enabled: false
+mariadb-init:
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
+  nameOverride: dmaap-dr-mariadb-init
 
 # Resource Limit flavor -By Default using small
 flavor: small
+
 # Segregation for Different environment (Small and Large)
 resources:
   small:
     limits:
-      cpu: 2000m
-      memory: 4Gi
+      cpu: 999
+      memory: 1Gi
     requests:
-      cpu: 500m
+      cpu: 0.5
       memory: 1Gi
   large:
     limits:
-      cpu: 4000m
-      memory: 8Gi
+      cpu: 999
+      memory: 2Gi
     requests:
-      cpu: 1000m
+      cpu: 1
       memory: 2Gi
   unlimited: {}
 
-config:
-  # dr provisioning server configuration
-  dmaapDrProv:
-    servicetype: NodePort
-    internalPort: 8080
-    internalPort2: 8443
-    portName: dr-prov-port
-    portName2: dr-prov-port2
-    nodePort: 59
-    nodePort2: 69
-  # dr-prov db configuration
-  dmaapDrDb:
-    mariadbServiceName: dmaap-dr-db-svc
-    mariadbServicePort: 3306
-    mariadbContName: dmaap-dr-db
+#Pods Security Context
+securityContext:
+  user_id: 1000
+  group_id: 1000
 
-# mariadb-galera configuration
-mariadb:
-  name: dmaap-dr-db
-  nameOverride: dmaap-dr-db
-  replicaCount: 2
-  config:
-    mariadbRootPassword: datarouter
-    userName: datarouter
-    userPassword: datarouter
-    mysqlDatabase: datarouter
-  service:
-    name: dmaap-dr-db-svc
-    portName: dmaap-dr-db-svc
-  nfsprovisionerPrefix: dmaap-dr-db
-  persistence:
-    size: 1Gi
-    mountSubPath: data-router/dr-db-data
-  disableNfsProvisioner: true
+#Pods Service Account
+serviceAccount:
+  nameOverride: dmaap-dr-prov
+  roles:
+    - read