Merge "[CPS] Add new Topic for CPS-NCMP AVC Events"
diff --git a/docs/sections/release_notes/release-notes-honolulu.rst b/docs/sections/release_notes/release-notes-honolulu.rst
index 3a7891a..832ec58 100644
--- a/docs/sections/release_notes/release-notes-honolulu.rst
+++ b/docs/sections/release_notes/release-notes-honolulu.rst
@@ -128,7 +128,7 @@
 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 b4ecfcd..33613bc 100644
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ b/kubernetes/cps/templates/cps-kafka-topic.yaml
@@ -45,4 +45,14 @@
 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 fafc8c3..229e5dc 100644
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ b/kubernetes/cps/templates/cps-kafka-user.yaml
@@ -54,4 +54,12 @@
         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 f3e6198..97addae 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -65,6 +65,11 @@
     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: