[DCAEGEN2] Update helm chart for dcae-ves-collector

Update helm chart for ves-collector changes to remove DMaaP dependency

Issue-ID: DCAEGEN2-3401
Change-Id: I1aa286aeecd9fad0ef551f8018beed03c31b35bd
Signed-off-by: sushant53 <sushant.jadhav@t-systems.com>

5 files changed, 125 insertions, 3 deletions

diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
index 0eebf3f725..2f4baac11c 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/Chart.yaml
@@ -3,6 +3,7 @@
 # Copyright (c) 2021 J. F. Lucas. All rights reserved.
 # Modifications Copyright © 2021 Orange
 # Modifications Copyright © 2021 Nordix Foundation
+# Modifications Copyright © 2024 Deutsche Telekom Intellectual Property.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,10 +19,10 @@
 # ============LICENSE_END=========================================================
 
 apiVersion: v2
-appVersion: "Kohn"
+appVersion: "NewDelhi"
 description: DCAE VES Collector
 name: dcae-ves-collector
-version: 13.0.0
+version: 13.1.0
 
 dependencies:
   - name: common
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkatopic.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkatopic.yaml
new file mode 100644
index 0000000000..8e3ee32cb2
--- /dev/null
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkatopic.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2024 Deutsche Telekom Intellectual Property. 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.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+{{ include "common.kafkatopic" . }}
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkauser.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkauser.yaml
new file mode 100644
index 0000000000..5c7edd5b19
--- /dev/null
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/kafkauser.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2024 Deutsche Telekom Intellectual Property. 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.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+{{ include "common.kafkauser" . }}
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/secret.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/secret.yaml
new file mode 100644
index 0000000000..4d82cf3b47
--- /dev/null
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/templates/secret.yaml
@@ -0,0 +1,17 @@
+{{/*
+# Copyright © 2024 Deutsche Telekom Intellectual Property. 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.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
+{{ include "common.secretFast" . }}
diff --git a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
index ab538fd4a6..67b8824740 100644
--- a/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-ves-collector/values.yaml
@@ -3,6 +3,7 @@
 # Copyright (c) 2021-2022 Nokia.  All rights reserved.
 # Copyright (c) 2021-2023 J. F. Lucas. All rights reserved.
 # Copyright (c) 2022 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2024 Deutsche Telekom Intellectual Property. 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.
@@ -41,7 +42,7 @@ certPostProcessorImage: onap/org.onap.oom.platform.cert-service.oom-certservice-
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.12.3
+image: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.12.4
 pullPolicy: Always
 
 # log directory where logging sidecar should look for log files
@@ -121,6 +122,77 @@ serviceMesh:
 applicationEnv:
   CBS_CLIENT_CONFIG_PATH: '/app-config-input/application_config.yaml'
   LOG4J_FORMAT_MSG_NO_LOOKUPS: 'true'
+  BOOTSTRAP_SERVERS: '{{ include "common.release" . }}-strimzi-kafka-bootstrap:9092'
+  JAAS_CONFIG:
+    externalSecret: true
+    externalSecretUid: '{{ include "common.name" . }}-ku'
+    key: sasl.jaas.config
+
+# Strimzi Kafka config
+kafkaUser:
+  acls:
+    - name: unauthenticated.VES_PNFREG_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.VES_NOTIFICATION_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_HEARTBEAT_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_OTHER_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_FAULT_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.VES_MEASUREMENT_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+    - name: unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
+      type: topic
+      patternType: literal
+      operations: [Write, DescribeConfigs]
+
+kafkaTopic:
+  - name: unauthenticated.VES_PNFREG_OUTPUT
+    strimziTopicName: unauthenticated.ves-pnfreg-output
+  - name: unauthenticated.VES_NOTIFICATION_OUTPUT
+    strimziTopicName: unauthenticated.ves-notification-output
+  - name: unauthenticated.SEC_HEARTBEAT_OUTPUT
+    strimziTopicName: unauthenticated.sec-heartbeat-output
+  - name: unauthenticated.SEC_OTHER_OUTPUT
+    strimziTopicName: unauthenticated.sec-other-output
+  - name: unauthenticated.SEC_FAULT_OUTPUT
+    strimziTopicName: unauthenticated.sec-fault-output
+  - name: unauthenticated.VES_MEASUREMENT_OUTPUT
+    strimziTopicName: unauthenticated.ves-measurment-output
+  - name: unauthenticated.SEC_3GPP_FAULTSUPERVISION_OUTPUT
+    strimziTopicName: unauthenticated.sec-3gpp-faultsupervision-output
+  - name: unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
+    strimziTopicName: unauthenticated.sec-3gpp-provisioning-output
+  - name: unauthenticated.SEC_3GPP_HEARTBEAT_OUTPUT
+    strimziTopicName: unauthenticated.sec-3gpp-heartbeat-output
+  - name: unauthenticated.SEC_3GPP_PERFORMANCEASSURANCE_OUTPUT
+    strimziTopicName: unauthenticated.sec-3gpp-performanceassurance-output
 
 # initial application configuration
 applicationConfig: