Merge "[UUI] New Solve 2 components in one Docker"

diff --combined kubernetes/uui/components/uui-server/values.yaml
index 8b98ae6,fb1a434..c477d03
--- 1/kubernetes/uui/components/uui-server/values.yaml
--- 2/kubernetes/uui/components/uui-server/values.yaml
+++ b/kubernetes/uui/components/uui-server/values.yaml
@@@ -1,5 -1,5 +1,5 @@@
  # Copyright © 2017 Amdocs, Bell Canada
- #
+ # Modifications Copyright © 2022 CMCC Corporation
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
@@@ -15,9 -15,29 +15,29 @@@
  # Default values for uui.
  # This is a YAML-formatted file.
  # Declare variables to be passed into your templates.
+ 
+ #################################################################
+ # Global configuration defaults.
+ #################################################################
  global:
    uuiPortPrefix: 303
  
+ secrets:
+   - uid: pg-root-pass
+     name: &pgRootPassSecretName '{{ include "common.release" . }}-uui-pg-root-pass'
+     type: password
+     externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "uui-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+     password: '{{ .Values.postgres.config.pgRootpassword }}'
+     policy: generate
+   - uid: pg-user-creds
+     name: &pgUserCredsSecretName '{{ include "common.release" . }}-uui-pg-user-creds'
+     type: basicAuth
+     externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "uui-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+     login: '{{ .Values.postgres.config.pgUserName }}'
+     password: '{{ .Values.postgres.config.pgUserPassword }}'
+     passwordPolicy: generate
+ 
+ 
  #################################################################
  # AAF part
  #################################################################
@@@ -56,6 -76,11 +76,11 @@@ certInitializer
      echo "*** change ownership of certificates to targeted user"
      chown -R 1000 {{ .Values.credsPath }}
  
+ 
+ #################################################################
+ # Application configuration defaults.
+ #################################################################
+ 
  subChartsOnly:
    enabled: true
  
@@@ -71,6 -96,28 +96,28 @@@ pullPolicy: Alway
  msbaddr: msb-iag.{{include "common.namespace" .}}:443
  mraddr: message-router.{{include "common.namespace" .}}:3904
  
+ # application configuration override for postgres
+ postgres:
+   nameOverride: &postgresName uui-server-postgres
+   service:
+     name: *postgresName
+     name2: uui-server-pg-primary
+     name3: uui-server-pg-replica
+   container:
+     name:
+       primary: uui-server-pg-primary
+       replica: uui-server-pg-replica
+   persistence:
+     mountSubPath: uui/uuiserver/data
+     mountInitPath: uui/uuiserver
+   config:
+     pgUserName: uui
+     pgDatabase: uuidb
+     pgUserExternalSecret: *pgUserCredsSecretName
+     pgRootPasswordExternalSecret: *pgRootPassSecretName
+ 
+ 
+ 
  # flag to enable debugging - application support required
  debugEnabled: false
  
@@@ -103,7 -150,7 +150,7 @@@ service
  ingress:
    enabled: false
    service:
 -    - baseaddr: uuiserver
 +    - baseaddr: uui-server-api
        name: "uui-server"
        port: 8082
    config:
@@@ -135,3 -182,12 +182,12 @@@ resources
        cpu: 1
        memory: 500Mi
    unlimited: {}
+ 
+ serviceAccount:
+   nameOverride: uui-server
+   roles:
+     - read
+ 
+ securityContext:
+   user_id: 100
+   group_id: 655533