[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

2 files changed, 0 insertions, 171 deletions

diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml
deleted file mode 100644
index 88076471f7..0000000000
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-{{/*
-# Copyright © 2022-2023 Nordix Foundation
-#
-# 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.
-*/}}
-{{- if .Values.config.useStrimziKafka }}
-apiVersion: kafka.strimzi.io/v1beta2
-kind: KafkaTopic
-metadata:
-  name: {{ .Values.config.ncmpEventsTopic.name }}
-  labels:
-    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
-spec:
-  config:
-    retention.ms: {{ .Values.config.ncmpEventsTopic.retentionMs }}
----
-apiVersion: kafka.strimzi.io/v1beta2
-kind: KafkaTopic
-metadata:
-  name: {{ .Values.config.ncmpAsyncM2MTopic.name }}
-  labels:
-    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
-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 }}
----
-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
deleted file mode 100644
index 154c116bd1..0000000000
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-{{/*
-# Copyright © 2022-2023 Nordix Foundation
-#
-# 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.
-*/}}
-{{- if .Values.config.useStrimziKafka }}
-apiVersion: kafka.strimzi.io/v1beta2
-kind: KafkaUser
-metadata:
-  name: {{ include "common.release" . }}-{{ .Values.global.cpsKafkaUser }}
-  labels:
-    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
-spec:
-  authentication:
-    type: scram-sha-512
-  authorization:
-    type: simple
-    acls:
-    - resource:
-        type: group
-        name: {{ .Values.config.ncmpEventsTopic.consumer.groupId }}
-      operation: All
-    - resource:
-        type: topic
-        name: {{ .Values.config.ncmpEventsTopic.name }}
-      operation: All
-    - resource:
-        type: group
-        name: {{ .Values.config.ncmpAsyncM2MTopic.consumer.groupId }}
-      operation: All
-    - resource:
-        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
-    - 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