X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fvalues.yaml;h=5204aa7568f9866e7032088ec5b385c6e40cdecf;hb=0879dfcaad420fcc7a6adc77b2b9c72b9522e3cb;hp=5478e5baa8ecf4dbad18ec7c4fb95af31280d493;hpb=d74fe9fbe7aab6f0b9bc37bf71237b297cd63e94;p=oom.git

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 5478e5baa8..e15f8350a1 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -1,6 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2018-2020 AT&T Intellectual Property
-# Modifications Copyright (C) 2021 Nordix Foundation.
+# Modifications Copyright (C) 2021-2023 Nordix Foundation.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 # Global configuration defaults.
 #################################################################
 global:
-  aafEnabled: true
+  aafEnabled: false
   mariadb:
     # '&mariadbConfig' means we "store" the values for  later use in the file
     # with '*mariadbConfig' pointer.
@@ -27,6 +27,22 @@ global:
     service: &mariadbService
       name: &policy-mariadb policy-mariadb
       internalPort: 3306
+  prometheusEnabled: false
+  postgres:
+    localCluster: false
+    service:
+      name: pgset
+      name2: tcp-pgset-primary
+      name3: tcp-pgset-replica
+    container:
+      name: postgres
+  #Strimzi Kafka properties
+  useStrimziKafka: true
+  kafkaBootstrap: strimzi-kafka-bootstrap
+  policyKafkaUser: policy-kafka-user
+  kafkaTopics:
+    acRuntimeTopic:
+      name: policy.clamp-runtime-acm
 
 #################################################################
 # Secrets metaconfig
@@ -45,6 +61,40 @@ secrets:
     login: '{{ index .Values "mariadb-galera" "db" "user" }}'
     password: '{{ index .Values "mariadb-galera" "db" "password" }}'
     passwordPolicy: generate
+  - uid: policy-app-user-creds
+    name: &policyAppCredsSecret '{{ include "common.release" . }}-policy-app-user-creds'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.config.policyAppUserExternalSecret) . }}'
+    login: '{{ .Values.config.policyAppUserName }}'
+    password: '{{ .Values.config.policyAppUserPassword }}'
+    passwordPolicy: generate
+  - uid: policy-pap-user-creds
+    name: &policyPapCredsSecret '{{ include "common.release" . }}-policy-pap-user-creds'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.restServer.policyPapUserExternalSecret) . }}'
+    login: '{{ .Values.restServer.policyPapUserName }}'
+    password: '{{ .Values.restServer.policyPapUserPassword }}'
+    passwordPolicy: required
+  - uid: policy-api-user-creds
+    name: &policyApiCredsSecret '{{ include "common.release" . }}-policy-api-user-creds'
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.restServer.policyApiUserExternalSecret) . }}'
+    login: '{{ .Values.restServer.policyApiUserName }}'
+    password: '{{ .Values.restServer.policyApiUserPassword }}'
+    passwordPolicy: required
+  - uid: pg-root-pass
+    name: &pgRootPassSecretName '{{ include "common.release" . }}-policy-pg-root-pass'
+    type: password
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgRootPasswordExternalSecret) .) (hasSuffix "policy-pg-root-pass" .Values.postgres.config.pgRootPasswordExternalSecret) }}'
+    password: '{{ .Values.postgres.config.pgRootpassword }}'
+    policy: generate
+  - uid: pg-user-creds
+    name: &pgUserCredsSecretName '{{ include "common.release" . }}-policy-pg-user-creds'
+    type: basicAuth
+    externalSecret: '{{ ternary "" (tpl (default "" .Values.postgres.config.pgUserExternalSecret) .) (hasSuffix "policy-pg-user-creds" .Values.postgres.config.pgUserExternalSecret) }}'
+    login: '{{ .Values.postgres.config.pgUserName }}'
+    password: '{{ .Values.postgres.config.pgUserPassword }}'
+    passwordPolicy: generate
 
 db: &dbSecretsHook
   credsExternalSecret: *dbSecretName
@@ -52,41 +102,69 @@ db: &dbSecretsHook
 policy-api:
   enabled: true
   db: *dbSecretsHook
+  restServer:
+    apiUserExternalSecret: *policyApiCredsSecret
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-pap:
   enabled: true
   db: *dbSecretsHook
+  restServer:
+    papUserExternalSecret: *policyPapCredsSecret
+    apiUserExternalSecret: *policyApiCredsSecret
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-xacml-pdp:
   enabled: true
   db: *dbSecretsHook
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-apex-pdp:
   enabled: true
   db: *dbSecretsHook
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-drools-pdp:
   enabled: true
   db: *dbSecretsHook
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-distribution:
   enabled: true
   db: *dbSecretsHook
-policy-clamp-be:
+policy-clamp-ac-k8s-ppnt:
   enabled: true
-  db: *dbSecretsHook
-policy-clamp-fe:
+policy-clamp-ac-pf-ppnt:
+  enabled: true
+  restServer:
+    apiUserExternalSecret: *policyApiCredsSecret
+    papUserExternalSecret: *policyPapCredsSecret
+policy-clamp-ac-http-ppnt:
+  enabled: true
+policy-clamp-ac-a1pms-ppnt:
+  enabled: true
+policy-clamp-ac-kserve-ppnt:
   enabled: true
+policy-clamp-runtime-acm:
+  enabled: true
+  db: *dbSecretsHook
+  config:
+    appUserExternalSecret: *policyAppCredsSecret
 policy-nexus:
   enabled: false
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
+policy-gui:
+  enabled: false
+  config:
+    jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 
 #################################################################
 # DB configuration defaults.
 #################################################################
 
-repository: nexus3.onap.org:10001
-pullPolicy: Always
-
-mariadb:
-  image: mariadb:10.5.8
-
 dbmigrator:
-  image: onap/policy-db-migrator:2.3.0
+  image: onap/policy-db-migrator:2.6.1
   schema: policyadmin
   policy_home: "/opt/app/policy"
 
@@ -115,6 +193,33 @@ readiness:
   initialDelaySeconds: 10
   periodSeconds: 10
 
+
+config:
+  policyAppUserName: runtimeUser
+  useStrimziKafka: true
+  policyPdpPapTopic:
+    name: policy-pdp-pap
+    partitions: 10
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+    consumer:
+      groupId: policy-group
+  policyHeartbeatTopic:
+    name: policy-heartbeat
+    partitions: 10
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+    consumer:
+      groupId: policy-group
+  policyNotificationTopic:
+    name: policy-notification
+    partitions: 10
+    retentionMs: 7200000
+    segmentBytes: 1073741824
+    consumer:
+      groupId: policy-group
+  someConfig: blah
+
 mariadb-galera:
   # mariadb-galera.config and global.mariadb.config must be equals
   db:
@@ -134,6 +239,37 @@ mariadb-galera:
   serviceAccount:
     nameOverride: *policy-mariadb
 
+postgresImage: library/postgres:latest
+# application configuration override for postgres
+postgres:
+  nameOverride: &postgresName policy-postgres
+  service:
+    name: *postgresName
+    name2: policy-pg-primary
+    name3: policy-pg-replica
+  container:
+    name:
+      primary: policy-pg-primary
+      replica: policy-pg-replica
+  persistence:
+    mountSubPath: policy/postgres/data
+    mountInitPath: policy
+  config:
+    pgUserName: policy_user
+    pgDatabase: policyadmin
+    pgUserExternalSecret: *pgUserCredsSecretName
+    pgRootPasswordExternalSecret: *pgRootPassSecretName
+
+readinessCheck:
+  wait_for:
+    - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
+
+restServer:
+  policyPapUserName: policyadmin
+  policyPapUserPassword: zb!XztG34
+  policyApiUserName: policyadmin
+  policyApiUserPassword: zb!XztG34
+
 # Resource Limit flavor -By Default using small
 # Segregation for Different environment (small, large, or unlimited)
 flavor: small