[jenkins] Add option to configure extra volumes and init containers (#35)

Signed-off-by: Reinhard Nägele <[email protected]>

Author: unguiculus

charts/jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 description: The leading open source automation server
-version: 1.1.0
+version: 1.2.0
 appVersion: 2.164.3
 home: https://jenkins.io/
 icon: https://wiki.jenkins-ci.org/download/attachments/2916393/logo.png

charts/jenkins/README.md

@@ -45,6 +45,9 @@ Parameter | Description | Default
 `image.tag` | The Jenkins image tag | `2.164.3-alpine`
 `image.pullPolicy` | The Jenkins image pull policy | `IfNotPresent`
 `imagePullSecrets` | Image pull secrets | `[]`
+`extraInitContainers` | Additional init containers. Passed through the `tpl` function and thus to be configured as string | `""`
+`extraVolumeMounts` | Add additional volumes mounts. Passed through the `tpl` function and thus to be configured as string | `""`
+`extraVolumes` | Add additional volumes. Passed through the `tpl` function and thus to be configured as string | `""`
 `podAnnotations` | Annotations for the Jenkins pod | `{}`
 `javaOpts` | `JAVA_OPTS` for the Jenkins process | `-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -XX:MaxRAMFraction=2 -XshowSettings:vm`
 `extraEnv` | Allows the specification of additional environment variables for Jenkins. Passed through the `tpl` function and thus to be configured as string | `""`

charts/jenkins/ci/k8s-values.yaml

@@ -142,5 +142,15 @@ k8sCredentials:
         sdf fdsf dsf fdsfsfsdf sf sd
         sdf fsf dsfsf sdfs fsdf f
 
+extraInitContainers: |
+  - name: jenkins-extra-init
+    image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+    imagePullPolicy: {{ .Values.image.pullPolicy }}
+    command:
+      - "sh"
+    args:
+      - "-c"
+      - "echo 'Hello from extra init container!'"
+
 test:
   enabled: true

charts/jenkins/templates/deployment.yaml

@@ -48,6 +48,9 @@ spec:
           resources:
             {{- toYaml . | nindent 12 }}
         {{- end }}
+      {{- with .Values.extraInitContainers }}
+        {{- tpl . $ | nindent 8 }}
+      {{- end }}
       containers:
         - name: jenkins-master
           image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
@@ -91,6 +94,9 @@ spec:
               mountPath: /casc-secrets
               readOnly: true
           {{- end }}
+          {{- with .Values.extraVolumeMounts }}
+            {{- tpl . $ | nindent 12 }}
+          {{- end }}
         {{- with .Values.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
@@ -141,3 +147,6 @@ spec:
           configMap:
             name: {{ include "jenkins.fullname" $ }}-{{ include "jenkins.configmapSuffix" . }}
       {{- end }}
+      {{- with .Values.extraVolumes }}
+        {{- tpl . $ | nindent 8 }}
+      {{- end }}

charts/jenkins/values.yaml

@@ -9,6 +9,9 @@ image:
 imagePullSecrets: []
 # - my-pull-secret
 
+## Additional init containers, e. g. for providing custom themes
+extraInitContainers: |
+
 # Annotations for the Jenkins pod
 podAnnotations: {}
 
@@ -81,6 +84,10 @@ serviceAccount:
   #   # If not set and create is true, a name is generated using the fullname template
   #   name: "bar-account"
 
+## Add additional volumes and mounts
+extraVolumes: |
+extraVolumeMounts: |
+
 rbac:
   master:
     # Specifies whether RBAC resources should be created