X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2%2Fcomponents%2Fdcae-dashboard%2Fvalues.yaml;h=8e3f94dc645bce52671f7998f0887976de479092;hb=07efa9bb787a6a04dfb9771a3940b3461d247d20;hp=615afc42c2de9bb4160b9895134b6f464eed561e;hpb=b500d833613a478a1c9d8ac36a665e25f3ec5ef0;p=oom.git

diff --git a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
index 615afc42c2..83914d423c 100644
--- a/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
+++ b/kubernetes/dcaegen2/components/dcae-dashboard/values.yaml
@@ -1,6 +1,6 @@
 #============LICENSE_START========================================================
 # ================================================================================
-# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2019-2021 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,14 +20,24 @@
 #################################################################
 global:
   nodePortPrefixExt: 304
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.0
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
-  tlsRepository: nexus3.onap.org:10001
-  tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:1.0.3
+  tlsImage: onap/org.onap.dcaegen2.deployments.tls-init-container:2.1.0
+
+secrets:
+  - uid: pg-user-creds
+    name: &pgUserCredsSecretName '{{ include "common.release" . }}-dcae-dashboard-pg-user-creds'
+    type: basicAuth
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "dcae-dashboard-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+    login: '{{ .Values.postgres.config.pgUserName }}'
+    password: '{{ .Values.postgres.config.pgUserPassword }}'
+    passwordPolicy: generate
+  - uid: 'cm-pass'
+    type: password
+    externalSecret: '{{ tpl (default "" .Values.config.cloudifyManagerPasswordExternalSecret) . }}'
+    password: '{{ .Values.config.cloudifyManagerPassword }}'
+    policy: required
 
 config:
+  cloudifyManagerPassword: "override me"
   logstashServiceName: log-ls
   logstashPort: 5044
   dhandler_url: https://deployment-handler:8443
@@ -43,8 +53,7 @@ config:
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0
+image: onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.4.3
 pullPolicy: Always
 
 # probe configuration parameters
@@ -57,16 +66,16 @@ liveness:
   enabled: false
 
 readiness:
-  initialDelaySeconds: 30
-  periodSeconds: 30
+  initialDelaySeconds: 300
+  periodSeconds: 90
   path: /ccsdk-app/health
-  scheme: HTTP
+  scheme: HTTPS
 
 service:
   type: NodePort
   name: dashboard
-  externalPort: 8080
-  internalPort: 8080
+  externalPort: 8443
+  internalPort: 8443
   nodePort: 18
 # application configuration override for postgres
 postgres:
@@ -81,25 +90,12 @@ postgres:
       replica: dcae-dashboard-pg-replica
   config:
     pgUserName: dashboard_pg_admin
+    pgUserExternalSecret: *pgUserCredsSecretName
     pgDatabase: dashboard_pg_db_common
-    pgPrimaryPassword: onapdemodb
-    pgUserPassword: onapdemodb
-    pgRootPassword: onapdemodb
     pgPort: "5432"
   persistence:
     mountSubPath: dcae-dashboard/data
     mountInitPath: dcae-dashboard
-  pgpool:
-    nameOverride: dcae-dashboard-pgpool
-    service:
-      name: dcae-dashboard-pgpool
-    credentials:
-      pgusername: dcae_dashboard
-      pgpassword: onapdemodb
-    container:
-      name:
-        primary: dcae-dashboard-pgpool-primary
-        replica: dcae-dashboard-pgpool-replica
 
 # Resource Limit flavor -By Default using small
 flavor: small
@@ -107,10 +103,10 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 2Gi
+      cpu: 4000m
+      memory: 4Gi
     requests:
-      cpu: 1
+      cpu: 1500m
       memory: 1Gi
   large:
     limits:
@@ -123,4 +119,3 @@ resources:
 # Kubernetes namespace for components deployed via Cloudify manager
 # If empty, use the common namespace
 # dcae_ns: "dcae"
-