Merge pull request #70 from vector-im/bbz/image-pull-secret-support

Add imagePullSecret support
element-hq · Jun 27, 2023 · d1dca9f · d1dca9f
2 parents 13ed03d + 49fa094
commit d1dca9f
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 1 deletion.
diff --git a/Chart.yaml b/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.6.0
+version: 0.6.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/templates/haproxy-statefulset.yaml b/templates/haproxy-statefulset.yaml
@@ -38,6 +38,12 @@ spec:
           - labelSelector:
               matchLabels: {{ include "jitsi.haproxy.selectorLabels" $ | nindent 16 }}
             topologyKey: topology.kubernetes.io/zone
+    {{- if $.Values.haproxy.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.haproxy.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
+    {{- end }}
       containers:
       - env:
         - name: MY_POD_IP

diff --git a/templates/jicofo-deployment.yaml b/templates/jicofo-deployment.yaml
@@ -36,6 +36,12 @@ spec:
       serviceAccountName: {{ (($.Values.global).serviceAccount) }}
     {{- else }}
       automountServiceAccountToken: false
+    {{- end }}
+    {{- if $.Values.jicofo.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.jicofo.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
     {{- end }}
       containers:
       - env:

diff --git a/templates/jvb-statefulset.yaml b/templates/jvb-statefulset.yaml
@@ -35,6 +35,12 @@ spec:
       automountServiceAccountToken: false
     {{- with $.Values.jvb.extraPodSpec }}
       {{- toYaml . | nindent 6 }}
+    {{- end }}
+    {{- if $.Values.jvb.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.jvb.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
     {{- end }}
       containers:
       {{ if $.Values.jvb.monitoringEnable -}}

diff --git a/templates/prosody-deployment.yaml b/templates/prosody-deployment.yaml
@@ -40,6 +40,12 @@ spec:
       serviceAccountName: {{ (($.Values.global).serviceAccount) }}
     {{- else }}
       automountServiceAccountToken: false
+    {{- end }}
+    {{- if $.Values.prosody.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.prosody.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
     {{- end }}
       volumes:
         - name: prosody

diff --git a/templates/sysctl-jvb-daemonset.yaml b/templates/sysctl-jvb-daemonset.yaml
@@ -37,6 +37,12 @@ spec:
       automountServiceAccountToken: false
     {{- end }}
       hostNetwork: yes
+    {{- if $.Values.sysctljvb.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.sysctljvb.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
+    {{- end }}
       containers:
       - name: sysctl-jvb
         image: {{ $.Values.sysctljvb.image }}

diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
@@ -37,6 +37,12 @@ spec:
       serviceAccountName: {{ (($.Values.global).serviceAccount) }}
     {{- else }}
       automountServiceAccountToken: false
+    {{- end }}
+    {{- if $.Values.web.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range $secretName := $.Values.web.imagePullSecrets }}
+      - name: {{ $secretName }}
+      {{- end }}
     {{- end }}
       containers:
       - env: