Merge pull request #21 from torstenwalter/disable-mounting-secrets-dir

Signed-off-by: Torsten Walter <mail@torstenwalter.de>

Author: torstenwalter

charts/jenkins/CHANGELOG.md

@@ -10,7 +10,12 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 
 The change log until v1.5.7 was auto-generated based on git commits. Those entries include a reference to the git commit to be able to get more details.
 
-## 2.6.1 Do not  render emty JCasC templates
+## 2.6.2
+
+Only mount empty dir secrets-dir if either `master.enableXmlConfig` or `master.secretsFilesSecret` is set
+Fixes #19
+
+## 2.6.1 Do not render emty JCasC templates
 
 ## 2.6.0 First release in jenkinsci GitHub org
 

charts/jenkins/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.6.1
+version: 2.6.2
 appVersion: lts
 description: Open source continuous integration server. It supports multiple SCM tools
   including CVS, Subversion and Git. It can execute Apache Ant and Apache Maven-based

charts/jenkins/templates/config.yaml

@@ -166,9 +166,9 @@ data:
     fi
 {{- end }}
     echo "applying Jenkins configuration"
-    mkdir -p {{ .Values.master.jenkinsRef }}/secrets/;
 {{- if .Values.master.enableXmlConfig }}
     echo "apply XML configuration"
+    mkdir -p {{ .Values.master.jenkinsRef }}/secrets/;
     echo "false" > {{ .Values.master.jenkinsRef }}/secrets/slave-to-master-security-kill-switch;
 {{- if .Values.master.overwriteConfig }}
     echo "overwriting existing configuration"
@@ -256,6 +256,7 @@ data:
 {{- end }}
 {{- if .Values.master.secretsFilesSecret }}
     echo "copy secrets"
+    mkdir -p {{ .Values.master.jenkinsRef }}/secrets/;
     yes n | cp -i /var/jenkins_secrets/* {{ .Values.master.jenkinsRef }}/secrets/;
 {{- end }}
     echo "finished initialization"

charts/jenkins/templates/jenkins-master-deployment.yaml

@@ -139,8 +139,10 @@ spec:
               readOnly: true
             {{- end }}
             {{- end }}
+            {{- if or (.Values.master.enableXmlConfig) (.Values.master.secretsFilesSecret) }}
             - mountPath: {{ .Values.master.jenkinsRef }}/secrets/
               name: secrets-dir
+            {{- end }}
             {{- if .Values.master.secretsFilesSecret }}
             - mountPath: /var/jenkins_secrets
               name: jenkins-secrets
@@ -288,10 +290,12 @@ spec:
               readOnly: true
             {{- end }}
             {{- end }}
+            {{- if or (.Values.master.enableXmlConfig) (.Values.master.secretsFilesSecret) }}
             - mountPath: {{ .Values.master.jenkinsRef }}/secrets/
               name: secrets-dir
               readOnly: false
-            {{- if or .Values.master.secretsFilesSecret }}
+            {{- end }}
+            {{- if .Values.master.secretsFilesSecret }}
             - mountPath: /var/jenkins_secrets
               name: jenkins-secrets
               readOnly: true
@@ -370,8 +374,10 @@ spec:
           name: {{ template "jenkins.fullname" . }}-jobs
       {{- end }}
       {{- end }}
+      {{- if or (.Values.master.enableXmlConfig) (.Values.master.secretsFilesSecret) }}
       - name: secrets-dir
         emptyDir: {}
+      {{- end }}
       {{- if .Values.master.secretsFilesSecret }}
       - name: jenkins-secrets
         secret: