From 1507ea7ec3bc90ba859acfc6ac22fd23c443e14b Mon Sep 17 00:00:00 2001
From: Andreas Geissler <andreas-geissler@telekom.de>
Date: Fri, 30 May 2025 11:51:53 +0200
Subject: [PATCH] [POLICY] Allign with DT fixes

- Allign the charts with changes in DT to resolve lint checks
- Update OPA-PDP version to 1.0.6

Issue-ID: POLICY-5351

Change-Id: I1cbf63a6b7b19098d9507d0b13bdc0075250937a
Signed-off-by: Andreas Geissler <andreas@geisibee.de>
---
 kubernetes/policy/components/policy-opa-pdp/Chart.yaml         |  2 +-
 kubernetes/policy/components/policy-opa-pdp/values.yaml        |  5 +----
 .../components/policy-pap/resources/config/papParameters.yaml  | 10 +++++-----
 kubernetes/policy/templates/policy-kafka-topics.yaml           |  1 -
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/kubernetes/policy/components/policy-opa-pdp/Chart.yaml b/kubernetes/policy/components/policy-opa-pdp/Chart.yaml
index ead5e8770a..7a2d5316d0 100644
--- a/kubernetes/policy/components/policy-opa-pdp/Chart.yaml
+++ b/kubernetes/policy/components/policy-opa-pdp/Chart.yaml
@@ -19,7 +19,7 @@
 apiVersion: v2
 description: ONAP Policy OPA PDP (PDP-O)
 name: policy-opa-pdp
-version: 16.0.2
+version: 16.0.4
 
 dependencies:
   - name: common
diff --git a/kubernetes/policy/components/policy-opa-pdp/values.yaml b/kubernetes/policy/components/policy-opa-pdp/values.yaml
index 3f6943015c..efe97bef7c 100644
--- a/kubernetes/policy/components/policy-opa-pdp/values.yaml
+++ b/kubernetes/policy/components/policy-opa-pdp/values.yaml
@@ -38,12 +38,11 @@ secrets:
     password: '{{ .Values.restServer.password }}'
     passwordPolicy: required
 
-
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/policy-opa-pdp:1.0.5
+image: onap/policy-opa-pdp:1.0.6
 
 pullPolicy: Always
 
@@ -55,7 +54,6 @@ debugEnabled: false
 log:
   loglevel: "debug"
 
-
 # application configuration
 
 permissions:
@@ -263,4 +261,3 @@ kafkaUser:
       type: topic
       patternType: prefix
       operations: [ Create, Describe, Read, Write ]
-
diff --git a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
index 7b9a0f179e..ef1334a288 100644
--- a/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
+++ b/kubernetes/policy/components/policy-pap/resources/config/papParameters.yaml
@@ -56,13 +56,13 @@ pap:
     notification.name: {{ .Values.config.kafka.topics.policyNotification }}
     heartbeat.name: {{ .Values.config.kafka.topics.policyHeartbeat }}
   pdpParameters:
-    heartBeatMs: 12000000
+    heartBeatMs: 120000
     updateParameters:
-      maxRetryCount: 3
-      maxWaitMs: 36000000
+      maxRetryCount: 1
+      maxWaitMs: 36000
     stateChangeParameters:
-      maxRetryCount: 3
-      maxWaitMs: 36000000
+      maxRetryCount: 1
+      maxWaitMs: 36000
   savePdpStatisticsInDb: true
   topicParameterGroup:
     topicSources:
diff --git a/kubernetes/policy/templates/policy-kafka-topics.yaml b/kubernetes/policy/templates/policy-kafka-topics.yaml
index 7cb6559f9a..0f71ae1a2b 100644
--- a/kubernetes/policy/templates/policy-kafka-topics.yaml
+++ b/kubernetes/policy/templates/policy-kafka-topics.yaml
@@ -62,4 +62,3 @@ spec:
   config:
     retention.ms: {{ .Values.config.opaPdpDataTopic.retentionMs }}
     segment.bytes: {{ .Values.config.opaPdpDataTopic.segmentBytes }}
-
-- 
2.16.6