diff options
| -rw-r--r-- | kubernetes/cps/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/templates/kafkatopic.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-core/values.yaml | 10 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-temporal/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/cps/components/cps-temporal/values.yaml | 6 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/cps/components/ncmp-dmi-plugin/templates/kafkatopic.yaml | 16 | ||||
| -rw-r--r-- | kubernetes/cps/templates/cps-kafka-topic.yaml | 86 | ||||
| -rw-r--r-- | kubernetes/cps/templates/cps-kafka-user.yaml | 85 |
10 files changed, 38 insertions, 189 deletions
diff --git a/kubernetes/cps/Chart.yaml b/kubernetes/cps/Chart.yaml index 7b443c970c..06fdcf0305 100644 --- a/kubernetes/cps/Chart.yaml +++ b/kubernetes/cps/Chart.yaml @@ -17,7 +17,7 @@ apiVersion: v2 description: ONAP Configuration Persistance Service (CPS) name: cps -version: 13.0.0 +version: 13.0.1 dependencies: - name: common diff --git a/kubernetes/cps/components/cps-core/Chart.yaml b/kubernetes/cps/components/cps-core/Chart.yaml index 14e778da4d..b1aa1046dd 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 0000000000..7274ee02b2 --- /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 b44f45610a..15775147ca 100644 --- a/kubernetes/cps/components/cps-core/values.yaml +++ b/kubernetes/cps/components/cps-core/values.yaml @@ -197,12 +197,6 @@ kafkaTopic: - 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 @@ kafkaUser: - 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 10ae94f61e..4f3f317b29 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 afbf851add..b6b072c29a 100644 --- a/kubernetes/cps/components/cps-temporal/values.yaml +++ b/kubernetes/cps/components/cps-temporal/values.yaml @@ -160,12 +160,6 @@ kafkaUser: 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 bef04adb85..fb578590e0 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 0000000000..7274ee02b2 --- /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 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 |