diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2024-03-20 09:51:32 +0100 |
|---|---|---|
| committer | Andreas Geissler <andreas-geissler@telekom.de> | 2024-03-20 15:51:27 +0100 |
| commit | bd0d31acc349a67c01de0595d152b8448b5311d1 (patch) | |
| tree | 73ec72f08fa7f5b789b08573e2adc8a6b011214e /kubernetes/uui/components/uui-server | |
| parent | 5fa1a05b3142c1f70757d5ce5b4519e574f6f5b2 (diff) | |
[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 <andreas-geissler@telekom.de>
Diffstat (limited to 'kubernetes/uui/components/uui-server')
| -rw-r--r-- | kubernetes/uui/components/uui-server/templates/deployment.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/uui/components/uui-server/templates/job.yaml | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/kubernetes/uui/components/uui-server/templates/deployment.yaml b/kubernetes/uui/components/uui-server/templates/deployment.yaml index 64a041349e..eedbe6ac3a 100644 --- a/kubernetes/uui/components/uui-server/templates/deployment.yaml +++ b/kubernetes/uui/components/uui-server/templates/deployment.yaml @@ -126,5 +126,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-entrypoint defaultMode: 0755 - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" + {{- include "common.imagePullSecrets" . | nindent 6 }} diff --git a/kubernetes/uui/components/uui-server/templates/job.yaml b/kubernetes/uui/components/uui-server/templates/job.yaml index 943079b99f..6ca5ee4acb 100644 --- a/kubernetes/uui/components/uui-server/templates/job.yaml +++ b/kubernetes/uui/components/uui-server/templates/job.yaml @@ -66,11 +66,9 @@ spec: mountPath: /aaa/init/postgres.sql subPath: postgres.sql {{ include "common.waitForJobContainer" . | indent 6 | trim }} - imagePullSecrets: - - name: "{{ include "common.namespace" . }}-docker-registry-key" + {{- include "common.imagePullSecrets" . | nindent 6 }} serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}} volumes: - name: init-data configMap: name: {{ include "common.fullname" . }} - |