From: Lukasz Rajewski Date: Mon, 25 Mar 2024 09:54:20 +0000 (+0000) Subject: Merge "[COMMON] Make imagePullSecrets configurable" X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=3e345368d827d7694a63a77564d5a2bdca9cd3f6;hp=-c Merge "[COMMON] Make imagePullSecrets configurable" --- 3e345368d827d7694a63a77564d5a2bdca9cd3f6 diff --combined kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml index 5987fa188b,a17e0e594c..ec1932143d --- a/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml +++ b/kubernetes/so/components/so-bpmn-infra/templates/deployment.yaml @@@ -1,6 -1,5 +1,6 @@@ {{/* # Copyright © 2018 AT&T USA +# Copyright © 2024 Deutsche Telekom Intellectual Property. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@@ -48,11 -47,6 +48,11 @@@ spec {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "login") | indent 10 }} - name: DB_ADMIN_PASSWORD {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-admin-creds" "key" "password") | indent 10 }} + - name: JAAS_CONFIG + valueFrom: + secretKeyRef: + name: {{ include "common.name" . }}-ku + key: sasl.jaas.config envFrom: - configMapRef: name: {{ include "common.fullname" . }}-configmap @@@ -82,5 -76,4 +82,4 @@@ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }} - name: {{ include "common.fullname" . }}-logs emptyDir: {} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" + {{- include "common.imagePullSecrets" . | nindent 6 }}