X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fvalues.yaml;h=47ced8afd8dc14ff35af82ef1f6b9e96141b594f;hb=2d0db7cd17b6690d505b22a2f542149662ebf619;hp=3ff153ac6adade4b9679283df9d87383d4e5911a;hpb=6910bbe1e3f2e44e5e100b8fec34a6da8b8eb231;p=oom.git

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index 3ff153ac6a..47ced8afd8 100755
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -18,8 +18,8 @@
 # Global configuration defaults.
 #################################################################
 global:
-  aafEnabled: false
   mariadb:
+    localCluster: true
     # '&mariadbConfig' means we "store" the values for  later use in the file
     # with '*mariadbConfig' pointer.
     config: &mariadbConfig
@@ -38,6 +38,8 @@ global:
       name: postgres
   #Strimzi Kafka properties
   useStrimziKafka: true
+  # Temporary flag to disable strimzi for pf components - will be removed after native kafka support is added for drools and xacml
+  useStrimziKafkaPf: false
   kafkaBootstrap: strimzi-kafka-bootstrap
   policyKafkaUser: policy-kafka-user
   kafkaTopics:
@@ -82,19 +84,6 @@ secrets:
     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
@@ -143,6 +132,8 @@ 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
@@ -162,7 +153,7 @@ policy-gui:
 #################################################################
 
 dbmigrator:
-  image: onap/policy-db-migrator:2.6.1
+  image: onap/policy-db-migrator:3.0.2
   schema: policyadmin
   policy_home: "/opt/app/policy"
 
@@ -221,7 +212,7 @@ config:
 mariadb-galera:
   # mariadb-galera.config and global.mariadb.config must be equals
   db:
-    user: policy_user
+    user: policy-user
     # password:
     externalSecret: *dbSecretName
     name: &mysqlDbName policyadmin
@@ -231,6 +222,9 @@ mariadb-galera:
   # mariadb-galera.service and global.mariadb.service must be equals
   service: *mariadbService
   replicaCount: 1
+  mariadbOperator:
+    galera:
+      enabled: false
   persistence:
     enabled: true
     mountSubPath: policy/maria/data
@@ -253,10 +247,10 @@ postgres:
     mountSubPath: policy/postgres/data
     mountInitPath: policy
   config:
-    pgUserName: policy_user
+    pgUserName: policy-user
     pgDatabase: policyadmin
-    pgUserExternalSecret: *pgUserCredsSecretName
-    pgRootPasswordExternalSecret: *pgRootPassSecretName
+    pgUserExternalSecret: *dbSecretName
+    pgRootPasswordExternalSecret: *dbRootPassSecretName
 
 readinessCheck:
   wait_for: