[STRIMZI] Sync chart with DT

- Update the label settings
- Add configurable password for kafka-bridge

Issue-ID: OOM-3344

Change-Id: I818b86ff6e280b038451836864d77dcb498a0a19
Signed-off-by: Andreas Geissler <andreas@geisibee.de>

diff --git a/kubernetes/strimzi/.helmignore b/kubernetes/strimzi/.helmignore
index 0f976e9..218ebb1 100644 (file)
--- a/kubernetes/strimzi/.helmignore
+++ b/kubernetes/strimzi/.helmignore
@@ -20,3 +20,5 @@
 .idea/
 *.tmproj
 Chart.lock
+# OOM specific dirs
+components/

diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/.helmignore b/kubernetes/strimzi/components/strimzi-kafka-bridge/.helmignore
index 0f976e9..218ebb1 100644 (file)
--- a/kubernetes/strimzi/components/strimzi-kafka-bridge/.helmignore
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/.helmignore
@@ -20,3 +20,5 @@
 .idea/
 *.tmproj
 Chart.lock
+# OOM specific dirs
+components/

diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml
index ca4a4e9..63c4a2c 100644 (file)
--- a/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/Chart.yaml
@@ -15,7 +15,7 @@
 apiVersion: v2
 description: ONAP Strimzi Kafka Bridge
 name: strimzi-kafka-bridge
-version: 13.0.1
+version: 13.0.3
 
 dependencies:
   - name: common

diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/configmap.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/configmap.yaml
index 7f4dea4..83c8045 100644 (file)
--- a/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/configmap.yaml
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/configmap.yaml
@@ -18,6 +18,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "common.fullname" . }}-kb-logging-cm
+  labels: {{- include "common.labels" . | nindent 4 }}
   namespace: {{ include "common.namespace" . }}
 data:
 {{ tpl (.Files.Glob "resources/config/log4j2.properties").AsConfig . | indent 2 }}

diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
index 8364dfe..6f00574 100644 (file)
--- a/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/templates/strimzi-kb.yaml
@@ -24,7 +24,7 @@ spec:
     username: {{ .Values.config.strimziKafkaAdminUser }}
     passwordSecret:
       secretName: {{ .Values.config.strimziKafkaAdminUser }}
-      password: password
+      password: {{ .Values.config.strimziKafkaAdminPassword }}
   enableMetrics: {{ .Values.config.enableMetrics }}
   http:
     port: {{ .Values.config.port }}

diff --git a/kubernetes/strimzi/components/strimzi-kafka-bridge/values.yaml b/kubernetes/strimzi/components/strimzi-kafka-bridge/values.yaml
index fa7b10a..f349558 100644 (file)
--- a/kubernetes/strimzi/components/strimzi-kafka-bridge/values.yaml
+++ b/kubernetes/strimzi/components/strimzi-kafka-bridge/values.yaml
@@ -29,6 +29,7 @@ config:
   saslMechanism: parentValue
   kafkaInternalPort: parentValue
   strimziKafkaAdminUser: parentValue
+  strimziKafkaAdminPassword: password
 
 # nameOverride is required to avoid duplication
 # in pod and service names ie ...-bridge-bridge-{random hex}

diff --git a/kubernetes/strimzi/templates/kafka-rebalance.yaml b/kubernetes/strimzi/templates/kafka-rebalance.yaml
index 6d5f143..f7e6ad0 100644 (file)
--- a/kubernetes/strimzi/templates/kafka-rebalance.yaml
+++ b/kubernetes/strimzi/templates/kafka-rebalance.yaml
@@ -1,5 +1,5 @@
 {{/*
-# Copyright (c) 2023 Deutsche Telekom
+# Copyright (c) 2023-2025 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaRebalance
 metadata:
   name: {{ include "common.fullname" . }}-kafka-rebalance
-  labels:
+  labels: {{- include "common.labels" . | nindent 4 }}
     strimzi.io/cluster: {{ include "common.release" . }}-strimzi
 spec: {}
 {{- end }}

diff --git a/kubernetes/strimzi/templates/pod-monitor.yaml b/kubernetes/strimzi/templates/pod-monitor.yaml
index be288a4..329784f 100644 (file)
--- a/kubernetes/strimzi/templates/pod-monitor.yaml
+++ b/kubernetes/strimzi/templates/pod-monitor.yaml
@@ -1,5 +1,5 @@
 {{/*
-# Copyright (c) 2023 Deutsche Telekom
+# Copyright (c) 2023-2025 Deutsche Telekom
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,14 @@ metadata:
     ##
     # labels:
     #   prometheus: kube-prometheus
-  labels: {{- toYaml $.Values.metrics.podMonitor.labels | nindent 4 }}
+  labels:
+    app: '{{- default $.Chart.Name $.Values.nameOverride | trunc 63 | trimSuffix "-" -}}'
+    {{- if $.Chart.AppVersion }}
+    version: '{{ $.Chart.AppVersion | replace "+" "_" }}'
+    {{- else }}
+    version: '{{ $.Chart.Version | replace "+" "_" }}'
+    {{- end }}
+    {{- toYaml $.Values.metrics.podMonitor.labels | nindent 4 }}
 spec:
   selector:
     matchLabels:

diff --git a/kubernetes/strimzi/templates/strimzi-kafka-admin-user.yaml b/kubernetes/strimzi/templates/strimzi-kafka-admin-user.yaml
index 4532777..7a3e7ef 100644 (file)
--- a/kubernetes/strimzi/templates/strimzi-kafka-admin-user.yaml
+++ b/kubernetes/strimzi/templates/strimzi-kafka-admin-user.yaml
@@ -17,7 +17,7 @@ apiVersion: kafka.strimzi.io/v1beta2
 kind: KafkaUser
 metadata:
   name: {{ .Values.config.strimziKafkaAdminUser }}
-  labels:
+  labels: {{- include "common.labels" . | nindent 4 }}
     strimzi.io/cluster: {{ include "common.release" . }}-strimzi
 spec:
   authentication: