From bd0d31acc349a67c01de0595d152b8448b5311d1 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Wed, 20 Mar 2024 09:51:32 +0100 Subject: [COMMON] Make imagePullSecrets configurable Currently in ONAP the imagePullSecrets is hardcoded to 'onap-docker-registry-key' which is created by the repository-wrapper component. With this change the secrets can be configured via setting global.imagePullSecrets and optionally per image if it is configured as map (image.pullSecrets) Issue-ID: OOM-3284 Change-Id: I8644f9b46043b6014219c42928e057b149df43a4 Signed-off-by: Andreas Geissler --- kubernetes/strimzi/templates/strimzi-kafka.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'kubernetes/strimzi/templates/strimzi-kafka.yaml') diff --git a/kubernetes/strimzi/templates/strimzi-kafka.yaml b/kubernetes/strimzi/templates/strimzi-kafka.yaml index a808b84441..aee4696fe0 100644 --- a/kubernetes/strimzi/templates/strimzi-kafka.yaml +++ b/kubernetes/strimzi/templates/strimzi-kafka.yaml @@ -69,6 +69,7 @@ spec: - {{ .Values.config.strimziKafkaAdminUser }} template: pod: + {{- include "common.imagePullSecrets" . | nindent 8 }} securityContext: runAsUser: 0 fsGroup: 0 @@ -113,6 +114,7 @@ spec: zookeeper: template: pod: + {{- include "common.imagePullSecrets" . | nindent 8 }} securityContext: runAsUser: 0 fsGroup: 0 @@ -149,10 +151,16 @@ spec: key: zookeeper-metrics-config.yml {{- end }} entityOperator: + template: + pod: + {{- include "common.imagePullSecrets" . | nindent 8 }} topicOperator: {} userOperator: {} {{- if .Values.cruiseControl.enabled }} cruiseControl: + template: + pod: + {{- include "common.imagePullSecrets" . | nindent 8 }} metricsConfig: type: {{ .Values.cruiseControl.metricsConfig.type }} valueFrom: @@ -162,6 +170,9 @@ spec: {{- end }} {{- if .Values.metrics.kafkaExporter.enabled }} kafkaExporter: + template: + pod: + {{- include "common.imagePullSecrets" . | nindent 8 }} topicRegex: {{ .Values.metrics.kafkaExporter.topicRegex }} groupRegex: {{ .Values.metrics.kafkaExporter.groupRegex }} resources: -- cgit 1.2.3-korg