[POLICY] Add kafka support in policy charts

[oom.git] / kubernetes / policy / values.yaml

diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml
index bcb8746..370b193 100755 (executable)
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@ -44,16 +44,11 @@ global:
       name3: tcp-pgset-replica
     container:
       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
+  kafkaBootstrap: strimzi-kafka-bootstrap:9092
   policyKafkaUser: policy-kafka-user
   kafkaTopics:
     acRuntimeTopic:
       name: policy.clamp-runtime-acm
-
 #################################################################
 # Secrets metaconfig
 #################################################################
@@ -134,7 +129,7 @@ policy-apex-pdp:
   config:
     jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
 policy-drools-pdp:
-  enabled: true
+  enabled: false
   db: *dbSecretsHook
   config:
     jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.policyKafkaUser }}'
@@ -173,7 +168,7 @@ policy-gui:
 #################################################################
 
 dbmigrator:
-  image: onap/policy-db-migrator:3.0.2
+  image: onap/policy-db-migrator:3.1.0
   schema: policyadmin
   policy_home: "/opt/app/policy"
 
@@ -205,7 +200,6 @@ readiness:
 
 config:
   policyAppUserName: runtimeUser
-  useStrimziKafka: true
   policyPdpPapTopic:
     name: policy-pdp-pap
     partitions: 10
@@ -275,6 +269,18 @@ postgres:
 readinessCheck:
   wait_for:
     - '{{ ternary .Values.postgres.service.name "postgres" .Values.global.postgres.localCluster }}'
+  wait_for_global_operator:
+    pods:
+      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
+  wait_for_local_operator:
+    pods:
+      - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
+  wait_for_global:
+    apps:
+      - '{{ include "common.mariadbAppName" . }}'
+  wait_for_local:
+    apps:
+      - '{{ include "common.mariadbAppName" . }}'
 
 restServer:
   policyPapUserName: policyadmin