Fix CSIT Helm kafka installation

CSIT Helm uses latest tag for kafka. Version 7.9.1 can be used to support existing zookeeper based installation.
Couple of values moved to the values.yaml instead of the application config.
VFC Configurations removed.

Issue-ID: POLICY-5397
Change-Id: Ib267612609510aa5b915a3019cce0c0174ec1f79
Signed-off-by: aravind.est <aravindhan.a@est.tech>

diff --git a/helm/cp-kafka/kafka.yaml b/helm/cp-kafka/kafka.yaml
index db0ae74..47301ab 100644 (file)
--- a/helm/cp-kafka/kafka.yaml
+++ b/helm/cp-kafka/kafka.yaml
@@ -1,4 +1,4 @@
-# Copyright © 2024 Nordix Foundation
+# Copyright © 2024-2025 OpenInfra Foundation Europe. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ spec:
     spec:
       containers:
       - name: broker
-        image: confluentinc/cp-kafka:latest
+        image: confluentinc/cp-kafka:7.9.1
         ports:
         - containerPort: 9092
         command: ["bash", "-c", "unset KAFKA_PORT; /etc/confluent/docker/run"]

diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
index bbceccf..31c7859 100755 (executable)
--- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
+++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/resources/config/A1pmsParticipantParameters.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2023-2025 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ security:
   enable-csrf: false
 
 a1pms:
-  baseUrl: http://a1policymanagement.onap:8081
+  baseUrl: {{ .Values.a1pms.baseUrl }}
   headers:
     content-type: application/json
   endpoints:

diff --git a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
index 556fe6c..c70dec3 100755 (executable)
--- a/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
+++ b/helm/policy/components/policy-clamp-ac-a1pms-ppnt/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#  Copyright (C) 2023-2024 Nordix Foundation.
+#  Copyright (C) 2023-2025 OpenInfra Foundation Europe. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -30,6 +30,9 @@ restServer:
   user: participantUser
   password: zb!XztG34
 
+a1pms:
+  baseUrl: http://a1policymanagement.onap:8081
+
 # default number of instances
 replicaCount: 1
 

diff --git a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
index 184d873..bae68b0 100644 (file)
--- a/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
+++ b/helm/policy/components/policy-clamp-runtime-acm/resources/config/acRuntimeParameters.yaml
@@ -67,9 +67,9 @@ runtime:
     operationTopic: policy-acruntime-participant
     syncTopic: acm-ppnt-sync
   participantParameters:
-    heartBeatMs: 120000
-    maxStatusWaitMs: 150000
-    maxOperationWaitMs: 200000
+    heartBeatMs: {{ .Values.runtime.participantParameters.heartBeatMs }}
+    maxStatusWaitMs: {{ .Values.runtime.participantParameters.maxStatusWaitMs }}
+    maxOperationWaitMs: {{ .Values.runtime.participantParameters.maxOperationWaitMs }}
   topicParameterGroup:
     topicSources:
       -

diff --git a/helm/policy/components/policy-clamp-runtime-acm/values.yaml b/helm/policy/components/policy-clamp-runtime-acm/values.yaml
index ceb369c..8f8a4a5 100644 (file)
--- a/helm/policy/components/policy-clamp-runtime-acm/values.yaml
+++ b/helm/policy/components/policy-clamp-runtime-acm/values.yaml
@@ -1,5 +1,5 @@
 #  ============LICENSE_START=======================================================
-#   Copyright (C) 2022,2024-2025 Nordix Foundation.
+#   Copyright (C) 2022,2024-2025 OpenInfra Foundation Europe. All rights reserved.
 #  ================================================================================
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -31,6 +31,12 @@ config:
   policyAppUserName: runtimeUser
   policyAppUserPassword: zb!XztG34
 
+runtime:
+  participantParameters:
+    heartBeatMs: 120000
+    maxStatusWaitMs: 150000
+    maxOperationWaitMs: 200000
+
 db:
   user: policy-user
   password: policy-user

diff --git a/helm/policy/components/policy-models-simulator/templates/deployment.yaml b/helm/policy/components/policy-models-simulator/templates/deployment.yaml
index 84f1197..e5f5670 100644 (file)
--- a/helm/policy/components/policy-models-simulator/templates/deployment.yaml
+++ b/helm/policy/components/policy-models-simulator/templates/deployment.yaml
@@ -37,7 +37,6 @@ spec:
           - containerPort: {{ .Values.service.simulators.grpc.internalPort }}
           - containerPort: {{ .Values.service.simulators.sdnc.internalPort }}
           - containerPort: {{ .Values.service.simulators.so.internalPort }}
-          - containerPort: {{ .Values.service.simulators.vfc.internalPort }}
           livenessProbe:
             tcpSocket:
               port: {{ .Values.service.internalPort }}

diff --git a/helm/policy/components/policy-models-simulator/templates/service.yaml b/helm/policy/components/policy-models-simulator/templates/service.yaml
index 36cee7f..1f14e7a 100644 (file)
--- a/helm/policy/components/policy-models-simulator/templates/service.yaml
+++ b/helm/policy/components/policy-models-simulator/templates/service.yaml
@@ -67,23 +67,6 @@ spec:
 
 ---
 
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ .Values.service.simulators.vfc.name }}
-  labels:
-{{ include "policy-models-simulator.labels" . | indent 4 }}
-spec:
-  ports:
-    - port: {{ .Values.service.simulators.vfc.externalPort }}
-      targetPort: {{ .Values.service.simulators.vfc.internalPort }}
-      name: {{ .Values.service.simulators.vfc.name }}
-  selector:
-    app.kubernetes.io/name: {{ include "policy-models-simulator.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-
----
-
 apiVersion: v1
 kind: Service
 metadata: