diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-03-14 19:44:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-03-14 19:44:19 +0000 |
| commit | 8a626708ed05ca337586695b2056441fc6405fec (patch) | |
| tree | 92003f4373c76afaa9e26bb2684968017248d29f /kubernetes/policy/templates | |
| parent | 1ca95eead50a3b8994751b013d7b39dc1e5e3562 (diff) | |
| parent | 6910bbe1e3f2e44e5e100b8fec34a6da8b8eb231 (diff) | |
Merge "[POLICY-PPNT] Move policy-clamp-ppnt use case to use strimzi kafka"
Diffstat (limited to 'kubernetes/policy/templates')
| -rw-r--r-- | kubernetes/policy/templates/policy-kafka-topics.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/policy/templates/policy-kafka-user.yaml | 11 |
2 files changed, 4 insertions, 21 deletions
diff --git a/kubernetes/policy/templates/policy-kafka-topics.yaml b/kubernetes/policy/templates/policy-kafka-topics.yaml index 1894d62a42..d9d9769230 100644 --- a/kubernetes/policy/templates/policy-kafka-topics.yaml +++ b/kubernetes/policy/templates/policy-kafka-topics.yaml @@ -13,19 +13,7 @@ # 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.acRuntimeTopic.name }} - labels: - strimzi.io/cluster: {{ include "common.release" . }}-strimzi -spec: - partitions: {{ .Values.config.acRuntimeTopic.partitions }} - config: - retention.ms: {{ .Values.config.acRuntimeTopic.retentionMs }} - segment.bytes: {{ .Values.config.acRuntimeTopic.segmentBytes }} ---- +{{- if .Values.global.useStrimziKafka }} apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: diff --git a/kubernetes/policy/templates/policy-kafka-user.yaml b/kubernetes/policy/templates/policy-kafka-user.yaml index 43edb64c83..c000af1b82 100644 --- a/kubernetes/policy/templates/policy-kafka-user.yaml +++ b/kubernetes/policy/templates/policy-kafka-user.yaml @@ -1,6 +1,5 @@ {{/* -# Copyright © 2022 Nordix Foundation -# Modifications 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. @@ -14,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. */}} -{{- if .Values.config.useStrimziKafka }} +{{- if .Values.global.useStrimziKafka }} apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaUser metadata: @@ -29,11 +28,7 @@ spec: acls: - resource: type: group - name: {{ .Values.config.acRuntimeTopic.consumer.groupId }} - operation: All - - resource: - type: topic - name: {{ .Values.config.acRuntimeTopic.name }} + name: {{ .Values.config.policyPdpPapTopic.consumer.groupId }} operation: All - resource: type: topic |