[CPS] Unify way of KafkaTopic creation for CPS application
Do not use static templates but "common.kafkatopic" template
Issue-ID: OOM-3240
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: I67b2cfe839022795f8d7f6f42d2d8dc7e71653d6
diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml
index 14e778d..b1aa104 100644
--- a/kubernetes/cps/components/cps-core/Chart.yaml
+++ b/kubernetes/cps/components/cps-core/Chart.yaml
@@ -18,7 +18,7 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Core
name: cps-core
-version: 13.0.0
+version: 13.0.1
dependencies:
- name: common
diff --git a/kubernetes/cps/components/cps-core/templates/kafkatopic.yaml b/kubernetes/cps/components/cps-core/templates/kafkatopic.yaml
new file mode 100644
index 0000000..7274ee0
--- /dev/null
+++ b/kubernetes/cps/components/cps-core/templates/kafkatopic.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2023 Deutsche Telekom AG
+#
+# 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" . }}
\ No newline at end of file
diff --git a/kubernetes/cps/components/cps-core/values.yaml b/kubernetes/cps/components/cps-core/values.yaml
index b44f456..1577514 100644
--- a/kubernetes/cps/components/cps-core/values.yaml
+++ b/kubernetes/cps/components/cps-core/values.yaml
@@ -197,12 +197,6 @@
- name: &dmiCmEventsTopic dmi-cm-events
retentionMs: 7200000
segmentBytes: 1073741824
- - name: &ncmpAsyncM2MTopic ncmp-async-m2m
- retentionMs: 7200000
- segmentBytes: 1073741824
- - name: &cmAvcSubscriptionTopic cm-avc-subscription
- retentionMs: 7200000
- segmentBytes: 1073741824
kafkaUser:
authenticationType: scram-sha-512
@@ -216,10 +210,10 @@
- name: *dmiCmEventsTopic
type: topic
operations: [Read]
- - name: *ncmpAsyncM2MTopic
+ - name: &ncmpAsyncM2MTopic ncmp-async-m2m
type: topic
operations: [Read]
- - name: *cmAvcSubscriptionTopic
+ - name: &cmAvcSubscriptionTopic cm-avc-subscription
type: topic
operations: [Read]
diff --git a/kubernetes/cps/components/cps-temporal/Chart.yaml b/kubernetes/cps/components/cps-temporal/Chart.yaml
index 10ae94f..4f3f317 100644
--- a/kubernetes/cps/components/cps-temporal/Chart.yaml
+++ b/kubernetes/cps/components/cps-temporal/Chart.yaml
@@ -21,7 +21,7 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - Temporal
name: cps-temporal
-version: 13.0.0
+version: 13.0.1
dependencies:
- name: common
diff --git a/kubernetes/cps/components/cps-temporal/values.yaml b/kubernetes/cps/components/cps-temporal/values.yaml
index afbf851..b6b072c 100644
--- a/kubernetes/cps/components/cps-temporal/values.yaml
+++ b/kubernetes/cps/components/cps-temporal/values.yaml
@@ -160,12 +160,6 @@
type: topic
operations: [Read]
-kafkaTopic:
- - name: *dataUpdatedTopic
- # default values below can be overridden
- retentionMs: 7200000
- segmentBytes: 1073741824
-
logging:
level: INFO
path: /tmp
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
index bef04ad..fb57859 100644
--- a/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml
@@ -21,7 +21,7 @@
apiVersion: v2
description: ONAP Configuration Persistance Service (CPS) - NCMP-DMI-Plugin
name: ncmp-dmi-plugin
-version: 13.0.0
+version: 13.0.1
dependencies:
- name: common
diff --git a/kubernetes/cps/components/ncmp-dmi-plugin/templates/kafkatopic.yaml b/kubernetes/cps/components/ncmp-dmi-plugin/templates/kafkatopic.yaml
new file mode 100644
index 0000000..7274ee0
--- /dev/null
+++ b/kubernetes/cps/components/ncmp-dmi-plugin/templates/kafkatopic.yaml
@@ -0,0 +1,16 @@
+{{/*
+# Copyright © 2023 Deutsche Telekom AG
+#
+# 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" . }}
\ No newline at end of file