Merge pull request #28 from dominikkaminski/feature/imagePullSecrets

HELM-57 Add imagePullSecrets to xwiki
xwiki-contrib · Jan 11, 2024 · 7e3e27c · 7e3e27c
2 parents 09687d0 + 2f6b736
commit 7e3e27c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/charts/xwiki/templates/xwiki.yaml b/charts/xwiki/templates/xwiki.yaml
@@ -74,7 +74,7 @@ spec:
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-        {{- if (and .Values.externalDB.customKeyRef .Values.externalDB.customKeyRef.enabled ) }} 
+        {{- if (and .Values.externalDB.customKeyRef .Values.externalDB.customKeyRef.enabled ) }}
               name: {{ .Values.externalDB.customKeyRef.name | quote }}
               key:  {{ .Values.externalDB.customKeyRef.key  | quote }}
         {{- else if .Values.mysql.enabled }}
@@ -178,6 +178,12 @@ spec:
     {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
+    {{- end }}
+    {{- if .Values.imagePullSecrets }}
+      imagePullSecrets:
+      {{- range .Values.imagePullSecrets }}
+        - name: "{{ . }}"
+      {{- end }}
     {{- end }}
       volumes:
       - name: configmaps

diff --git a/charts/xwiki/values.yaml b/charts/xwiki/values.yaml
@@ -310,6 +310,15 @@ affinity: {}
   #         - e2e-az1
   #         - e2e-az2
 
+# Credentials to fetch images from private registry.
+# Ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+#
+# imagePullSecrets:
+#   - "docker-registry"
+#
+imagePullSecrets: []
+
+
 # Custom configuration files for xwiki
 customConfigs:
   # Properties key that exists, replace in line is done with value here defined.
@@ -395,7 +404,7 @@ probes:
     initialDelaySeconds: 30
     timeoutSeconds: 3
     periodSeconds: 30
-    # 5 minutes 
+    # 5 minutes
     failureThreshold: 10
     successThreshold: 1
   readiness:
@@ -406,7 +415,7 @@ probes:
     initialDelaySeconds: 30
     timeoutSeconds: 3
     periodSeconds: 30
-    # 5 minutes 
+    # 5 minutes
     failureThreshold: 10
     successThreshold: 1
 
@@ -427,4 +436,4 @@ prometheus:
       rules:
       - pattern: ".*"
   podmonitor:
-    enabled: true
+    enabled: true