From e2f7ecdf9939e2ae42d5ea488501d4a41707fee1 Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Fri, 16 Dec 2022 16:02:23 +0200 Subject: [PATCH] render imagepullsecrets --- library/common/1.0.0/templates/lib/general/_pod.tpl | 10 +++++++--- library/common/1.0.0/templates/loader/_apply.tpl | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/library/common/1.0.0/templates/lib/general/_pod.tpl b/library/common/1.0.0/templates/lib/general/_pod.tpl index 45df2a2d33..095122c343 100644 --- a/library/common/1.0.0/templates/lib/general/_pod.tpl +++ b/library/common/1.0.0/templates/lib/general/_pod.tpl @@ -34,7 +34,7 @@ nodeSelector: tolerations: {{- . | nindent 2 }} {{- end -}} -{{/* TODO: imagePullSecrets, affinity, topologySpreadConstraints, not something critical as of now. */}} +{{/* TODO: affinity, topologySpreadConstraints, not something critical as of now. */}} {{- with .Values.termination.gracePeriodSeconds }} terminationGracePeriodSeconds: {{ . }} {{- end }} @@ -42,11 +42,15 @@ enableServiceLinks: {{ .Values.enableServiceLinks }} {{- with (include "ix.v1.common.container.podSecurityContext" (dict "podSecCont" .Values.podSecurityContext) | trim) }} securityContext: {{- . | nindent 2 }} -{{- end }} +{{- end -}} +{{- with (include "ix.v1.common.imagePullSecrets" . | trim) }} +imagePullSecrets: + {{- . | nindent 2 }} +{{- end -}} {{- with (include "ix.v1.common.controller.mainContainer" . | trim) }} containers: {{- . | nindent 2 }} -{{- end }}{{/*TODO: init/install/upgradeContainers */}} +{{- end -}}{{/*TODO: init/install/upgradeContainers */}} {{- with (include "ix.v1.common.controller.volumes" . | trim) }} volumes: {{- . | nindent 2 }} diff --git a/library/common/1.0.0/templates/loader/_apply.tpl b/library/common/1.0.0/templates/loader/_apply.tpl index 84ce34d400..5fea09782a 100644 --- a/library/common/1.0.0/templates/loader/_apply.tpl +++ b/library/common/1.0.0/templates/loader/_apply.tpl @@ -4,6 +4,8 @@ {{- include "ix.v1.common.spawner.certificate" . | nindent 0 -}} + {{- include "ix.v1.common.spawner.imagePullSecret" . | nindent 0 -}} + {{- include "ix.v1.common.spawner.serviceAccount" . | nindent 0 -}} {{- include "ix.v1.common.spawner.rbac" . | nindent 0 -}}