summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-04-13 13:19:07 +0000
committerGerrit Code Review <gerrit@onap.org>2023-04-13 13:19:07 +0000
commita1cd3d942ff9126cd9bcbce01faf45414ef29e27 (patch)
tree82a7712e0ebd6b4edf97d011447c1baf806fdf18
parent4db5f0b6fdd77b0c1fe6d57cefdb53c441f29bbf (diff)
parentfb475add9189b557ad79245baeac9e4962f8040f (diff)
Merge "[CPS] Add topics and parameters"
-rw-r--r--kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml1
-rw-r--r--kubernetes/cps/templates/cps-kafka-topic.yaml40
-rw-r--r--kubernetes/cps/templates/cps-kafka-user.yaml32
-rwxr-xr-xkubernetes/cps/values.yaml20
4 files changed, 92 insertions, 1 deletions
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
index 2a31c73303..1c15a2dbce 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/resources/config/application-helm.yml
@@ -54,7 +54,6 @@ spring.kafka.security.protocol: SASL_PLAINTEXT
spring.kafka.properties.sasl.mechanism: SCRAM-SHA-512
spring.kafka.properties.sasl.jaas.config: ${SASL_JAAS_CONFIG}
-
{{- if .Values.config.additional }}
{{ toYaml .Values.config.additional | nindent 2 }}
{{- end }}
diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml
index c3592bcec5..88076471f7 100644
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ b/kubernetes/cps/templates/cps-kafka-topic.yaml
@@ -43,4 +43,44 @@ metadata:
spec:
config:
retention.ms: {{ .Values.config.dmiCmEventsTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+ name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.name }}
+ labels:
+ strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+ config:
+ retention.ms: {{ .Values.config.ncmpCmAvcSubscriptionTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+ name: {{ .Values.config.ncmpCmEventsTopic.name }}
+ labels:
+ strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+ config:
+ retention.ms: {{ .Values.config.ncmpCmEventsTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+ name: {{ .Values.config.dmiCmAvcSubscriptionTopic.name }}
+ labels:
+ strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+ config:
+ retention.ms: {{ .Values.config.dmiCmAvcSubscriptionTopic.retentionMs }}
+---
+apiVersion: kafka.strimzi.io/v1beta2
+kind: KafkaTopic
+metadata:
+ name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.name }}
+ labels:
+ strimzi.io/cluster: {{ include "common.release" . }}-strimzi
+spec:
+ config:
+ retention.ms: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.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 469dddae86..154c116bd1 100644
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ b/kubernetes/cps/templates/cps-kafka-user.yaml
@@ -50,4 +50,36 @@ spec:
type: topic
name: {{ .Values.config.dmiCmEventsTopic.name }}
operation: All
+ - resource:
+ type: group
+ name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.consumer.groupId }}
+ operation: All
+ - resource:
+ type: topic
+ name: {{ .Values.config.ncmpCmAvcSubscriptionTopic.name }}
+ operation: All
+ - resource:
+ type: group
+ name: {{ .Values.config.ncmpCmEventsTopic.consumer.groupId }}
+ operation: All
+ - resource:
+ type: topic
+ name: {{ .Values.config.ncmpCmEventsTopic.name }}
+ operation: All
+ - resource:
+ type: group
+ name: {{ .Values.config.dmiCmAvcSubscriptionTopic.consumer.groupId }}
+ operation: All
+ - resource:
+ type: topic
+ name: {{ .Values.config.dmiCmAvcSubscriptionTopic.name }}
+ operation: All
+ - resource:
+ type: group
+ name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.consumer.groupId }}
+ operation: All
+ - resource:
+ type: topic
+ name: {{ .Values.config.dmiCmAvcSubscriptionResponseTopic.name }}
+ operation: All
{{- end }} \ No newline at end of file
diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index dccc4d039c..a08690ed53 100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -63,6 +63,26 @@ config:
retentionMs: 7200000
consumer:
groupId: ncmp-group
+ ncmpCmAvcSubscriptionTopic:
+ name: cm-avc-subscription
+ retentionMs: 7200000
+ consumer:
+ groupId: ncmp-group
+ ncmpCmEventsTopic:
+ name: cm-events
+ retentionMs: 7200000
+ consumer:
+ groupId: ncmp-group
+ dmiCmAvcSubscriptionTopic:
+ name: ncmp-dmi-cm-avc-subscription-ncmp-dmi-plugin
+ retentionMs: 7200000
+ consumer:
+ groupId: ncmp-group
+ dmiCmAvcSubscriptionResponseTopic:
+ name: dmi-ncmp-cm-avc-subscription
+ retentionMs: 7200000
+ consumer:
+ groupId: ncmp-group
# Enable all CPS components by default
cps-core: