From 709ea3f8ba1fc234548d13f818c7ec67e50a9ea8 Mon Sep 17 00:00:00 2001
From: mpriyank <priyank.maheshwari@est.tech>
Date: Fri, 13 Jan 2023 10:05:46 +0000
Subject: [PATCH] [CPS] Add new Topic for CPS-NCMP AVC Events

- Adding new topic dmi-cm-events
- added user and topic parameters
- changed one of the unreachable link for honolulu ( not relevant for
  CPS but had to do inorder to make the build pass )

Issue-ID: CPS-1385
Signed-off-by: JosephKeenan <joseph.keenan@est.tech>
Change-Id: I0037ae727f9f06c3b28a9331c7eb9fd7037f501d
Signed-off-by: mpriyank <priyank.maheshwari@est.tech>
---
 docs/sections/release_notes/release-notes-honolulu.rst |  2 +-
 kubernetes/cps/templates/cps-kafka-topic.yaml          | 10 ++++++++++
 kubernetes/cps/templates/cps-kafka-user.yaml           |  8 ++++++++
 kubernetes/cps/values.yaml                             |  5 +++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/docs/sections/release_notes/release-notes-honolulu.rst b/docs/sections/release_notes/release-notes-honolulu.rst
index 3a7891a1ba..832ec580cc 100644
--- a/docs/sections/release_notes/release-notes-honolulu.rst
+++ b/docs/sections/release_notes/release-notes-honolulu.rst
@@ -128,7 +128,7 @@ Known Vulnerabilities
 Workarounds
 -----------
 
-- `<https://github.com/bitnami/bitnami-docker-mariadb-galera/issues/35>`_
+- `<https://github.com/bitnami/charts/issues>`_
   Workaround is to generate a password with "short" strength or pregenerate
   passwords without single quote in it. Default deployment is using "short"
   password generation for mariadb.
diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml
index b4ecfcd9c4..33613bc39f 100644
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ b/kubernetes/cps/templates/cps-kafka-topic.yaml
@@ -45,4 +45,14 @@ metadata:
 spec:
   config:
     retention.ms: {{ .Values.config.ncmpAsyncM2MTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+  name: {{ .Values.config.dmiCmEventsTopic.name }}
+  labels:
+    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+  config:
+    retention.ms: {{ .Values.config.dmiCmEventsTopic.retentionMs }}
 {{- end }}
\ No newline at end of file
diff --git a/kubernetes/cps/templates/cps-kafka-user.yaml b/kubernetes/cps/templates/cps-kafka-user.yaml
index fafc8c3369..229e5dc2d5 100644
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ b/kubernetes/cps/templates/cps-kafka-user.yaml
@@ -54,4 +54,12 @@ spec:
         type: topic
         name: {{ .Values.config.ncmpAsyncM2MTopic.name }}
       operation: All
+    - resource:
+        type: group
+        name: {{ .Values.config.dmiCmEventsTopic.consumer.groupId }}
+      operation: All
+    - resource:
+        type: topic
+        name: {{ .Values.config.dmiCmEventsTopic.name }}
+      operation: All
 {{- end }}
\ No newline at end of file
diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index f3e6198ac1..97addae930 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -65,6 +65,11 @@ config:
     retentionMs: 600000
     consumer:
       groupId: ncmp-group
+  dmiCmEventsTopic:
+    name: dmi-cm-events
+    retentionMs: 7200000
+    consumer:
+      groupId: ncmp-group
 
 # Enable all CPS components by default
 cps-core:
-- 
2.16.6