From 9f2a0a07f134c9f5346ae241bb24748068e4f6bd Mon Sep 17 00:00:00 2001
From: efiacor <fiachra.corcoran@est.tech>
Date: Mon, 20 Feb 2023 17:05:30 +0000
Subject: [CPS] Change cps-core/temporal to use strimzi templates

CPS core and temporal will now use the custom strimzi kafka tmplates

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I3a25e036e3bc2315c335424f624ebf6d538994e2
Issue-ID: CPS-1503
---
 kubernetes/cps/templates/cps-kafka-topic.yaml | 14 +-------------
 kubernetes/cps/templates/cps-kafka-user.yaml  | 14 +-------------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'kubernetes/cps/templates')

diff --git a/kubernetes/cps/templates/cps-kafka-topic.yaml b/kubernetes/cps/templates/cps-kafka-topic.yaml
index 33613bc39f..c3592bcec5 100644
--- a/kubernetes/cps/templates/cps-kafka-topic.yaml
+++ b/kubernetes/cps/templates/cps-kafka-topic.yaml
@@ -1,5 +1,5 @@
 {{/*
-# Copyright © 2022 Nordix Foundation
+# 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.
@@ -16,18 +16,6 @@
 {{- if .Values.config.useStrimziKafka }}
 apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaTopic
-metadata:
-  name: {{ .Values.config.dataUpdatedTopic.name }}
-  labels:
-    strimzi.io/cluster: {{ include "common.release" . }}-strimzi
-spec:
-  partitions: {{ .Values.config.dataUpdatedTopic.partitions }}
-  config:
-    retention.ms: {{ .Values.config.dataUpdatedTopic.retentionMs }}
-    segment.bytes: {{ .Values.config.dataUpdatedTopic.segmentBytes }}
----
-apiVersion: kafka.strimzi.io/v1beta2
-kind: KafkaTopic
 metadata:
   name: {{ .Values.config.ncmpEventsTopic.name }}
   labels:
diff --git a/kubernetes/cps/templates/cps-kafka-user.yaml b/kubernetes/cps/templates/cps-kafka-user.yaml
index 229e5dc2d5..469dddae86 100644
--- a/kubernetes/cps/templates/cps-kafka-user.yaml
+++ b/kubernetes/cps/templates/cps-kafka-user.yaml
@@ -1,5 +1,5 @@
 {{/*
-# Copyright © 2022 Nordix Foundation
+# 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.
@@ -26,18 +26,6 @@ spec:
   authorization:
     type: simple
     acls:
-    - resource:
-        type: group
-        name: {{ .Values.config.dataUpdatedTopic.consumer.groupId }}
-      operation: Read
-    - resource:
-        type: topic
-        name: {{ .Values.config.dataUpdatedTopic.name }}
-      operation: Read
-    - resource:
-        type: topic
-        name: {{ .Values.config.dataUpdatedTopic.name }}
-      operation: Write
     - resource:
         type: group
         name: {{ .Values.config.ncmpEventsTopic.consumer.groupId }}
-- 
cgit 1.2.3-korg