From e1d86d896977ec03fe205f20d9ca189f1ad85db7 Mon Sep 17 00:00:00 2001 From: Ankit Chawla Date: Mon, 28 Feb 2022 14:18:18 +0530 Subject: [PATCH] Added imagepullsecrets to helm (#2364) --- charts/fission-all/templates/buildermgr/deployment.yaml | 4 ++++ charts/fission-all/templates/controller/deployment.yaml | 4 ++++ charts/fission-all/templates/executor/deployment.yaml | 4 ++++ charts/fission-all/templates/kubewatcher/deployment.yaml | 4 ++++ .../templates/mqt-fission-azurestoragequeue/deployment.yaml | 4 ++++ .../fission-all/templates/mqt-fission-kafka/deployment.yaml | 5 +++++ .../fission-all/templates/mqt-fission-nats/deployment.yaml | 4 ++++ charts/fission-all/templates/mqt-keda/deployment.yaml | 4 ++++ charts/fission-all/templates/router/deployment.yaml | 4 ++++ charts/fission-all/templates/storagesvc/deployment.yaml | 4 ++++ charts/fission-all/templates/timer/deployment.yaml | 4 ++++ charts/fission-all/values.yaml | 3 +++ 12 files changed, 48 insertions(+) diff --git a/charts/fission-all/templates/buildermgr/deployment.yaml b/charts/fission-all/templates/buildermgr/deployment.yaml index 0736158f..5e606265 100644 --- a/charts/fission-all/templates/buildermgr/deployment.yaml +++ b/charts/fission-all/templates/buildermgr/deployment.yaml @@ -62,6 +62,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} \ No newline at end of file diff --git a/charts/fission-all/templates/controller/deployment.yaml b/charts/fission-all/templates/controller/deployment.yaml index cfcd1ace..3703953b 100644 --- a/charts/fission-all/templates/controller/deployment.yaml +++ b/charts/fission-all/templates/controller/deployment.yaml @@ -78,6 +78,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} \ No newline at end of file diff --git a/charts/fission-all/templates/executor/deployment.yaml b/charts/fission-all/templates/executor/deployment.yaml index c4fa4e75..1ac3cae6 100644 --- a/charts/fission-all/templates/executor/deployment.yaml +++ b/charts/fission-all/templates/executor/deployment.yaml @@ -98,6 +98,10 @@ spec: {{- else if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} \ No newline at end of file diff --git a/charts/fission-all/templates/kubewatcher/deployment.yaml b/charts/fission-all/templates/kubewatcher/deployment.yaml index 260a72d8..02c9b376 100644 --- a/charts/fission-all/templates/kubewatcher/deployment.yaml +++ b/charts/fission-all/templates/kubewatcher/deployment.yaml @@ -40,6 +40,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} diff --git a/charts/fission-all/templates/mqt-fission-azurestoragequeue/deployment.yaml b/charts/fission-all/templates/mqt-fission-azurestoragequeue/deployment.yaml index 61eb5e02..9de91ebc 100644 --- a/charts/fission-all/templates/mqt-fission-azurestoragequeue/deployment.yaml +++ b/charts/fission-all/templates/mqt-fission-azurestoragequeue/deployment.yaml @@ -51,6 +51,10 @@ spec: {{- if .Values.terminationMessagePolicy }} terminationMessagePolicy: {{ .Values.terminationMessagePolicy }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: fission-svc {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} diff --git a/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml b/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml index 549b61de..a94ed0e7 100644 --- a/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml +++ b/charts/fission-all/templates/mqt-fission-kafka/deployment.yaml @@ -68,6 +68,11 @@ spec: secret: secretName: mqtrigger-kafka-secrets {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + --- {{- if .Values.kafka.authentication.tls.enabled }} diff --git a/charts/fission-all/templates/mqt-fission-nats/deployment.yaml b/charts/fission-all/templates/mqt-fission-nats/deployment.yaml index 7851099e..e16596e5 100644 --- a/charts/fission-all/templates/mqt-fission-nats/deployment.yaml +++ b/charts/fission-all/templates/mqt-fission-nats/deployment.yaml @@ -109,6 +109,10 @@ spec: value: {{ .Values.pprof.enabled | quote }} {{- include "opentracing.envs" . | indent 8 }} {{- include "opentelemtry.envs" . | indent 8 }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} serviceAccountName: fission-svc {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} diff --git a/charts/fission-all/templates/mqt-keda/deployment.yaml b/charts/fission-all/templates/mqt-keda/deployment.yaml index 59fe9850..3807c686 100644 --- a/charts/fission-all/templates/mqt-keda/deployment.yaml +++ b/charts/fission-all/templates/mqt-keda/deployment.yaml @@ -58,6 +58,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} diff --git a/charts/fission-all/templates/router/deployment.yaml b/charts/fission-all/templates/router/deployment.yaml index fbe60022..93904e05 100644 --- a/charts/fission-all/templates/router/deployment.yaml +++ b/charts/fission-all/templates/router/deployment.yaml @@ -130,6 +130,10 @@ spec: {{- else if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.router.extraCoreComponentPodConfig }} {{ toYaml .Values.router.extraCoreComponentPodConfig | indent 6 -}} {{- else }} diff --git a/charts/fission-all/templates/storagesvc/deployment.yaml b/charts/fission-all/templates/storagesvc/deployment.yaml index fbfee258..1a522975 100644 --- a/charts/fission-all/templates/storagesvc/deployment.yaml +++ b/charts/fission-all/templates/storagesvc/deployment.yaml @@ -98,6 +98,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} diff --git a/charts/fission-all/templates/timer/deployment.yaml b/charts/fission-all/templates/timer/deployment.yaml index d1a36806..9904771f 100644 --- a/charts/fission-all/templates/timer/deployment.yaml +++ b/charts/fission-all/templates/timer/deployment.yaml @@ -40,6 +40,10 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: {{ .Values.priorityClassName }} {{- end }} + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} {{- if .Values.extraCoreComponentPodConfig }} {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}} {{- end }} \ No newline at end of file diff --git a/charts/fission-all/values.yaml b/charts/fission-all/values.yaml index c2035493..ee3ef666 100644 --- a/charts/fission-all/values.yaml +++ b/charts/fission-all/values.yaml @@ -31,6 +31,9 @@ imageTag: v1.16.0-rc1 ## pullPolicy: IfNotPresent +## imageppullsecrets +imagePullSecrets: [] + ## priorityClassName represents the priority class name to use for Fission components. ## Refer to https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/ ## executor.priorityClassName takes precedence over this value for executor.