From f6a406e68a00ecb1ed8c94c065f02ebdc8fcf150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janosch=20Sch=C3=A4fer?=
 <97673513+JanoschSchaefer@users.noreply.github.com>
Date: Wed, 3 Aug 2022 09:52:42 +0200
Subject: [PATCH] Don't create plugins volume when not needed (#675)

---
 charts/jenkins/CHANGELOG.md                       |  4 ++++
 charts/jenkins/Chart.yaml                         |  2 +-
 .../templates/jenkins-controller-statefulset.yaml |  4 ++++
 .../jenkins-controller-statefulset-test.yaml      | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md
index 7b3abaa0c..eb69a8d01 100644
--- a/charts/jenkins/CHANGELOG.md
+++ b/charts/jenkins/CHANGELOG.md
@@ -12,6 +12,10 @@ 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.
 
+## 4.1.14
+
+If `installPlugins` is disabled, don't create unused plugins volume.
+
 ## 4.1.13
 
 Update Jenkins image and appVersion to jenkins lts release version 2.346.2
diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
index 2c811a9ad..1d14bd3ec 100644
--- a/charts/jenkins/Chart.yaml
+++ b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: jenkins
 home: https://jenkins.io/
-version: 4.1.13
+version: 4.1.14
 appVersion: 2.346.2
 description: Jenkins - Build great things at any scale! The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project.
 sources:
diff --git a/charts/jenkins/templates/jenkins-controller-statefulset.yaml b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
index 19ab40130..5069e29e9 100644
--- a/charts/jenkins/templates/jenkins-controller-statefulset.yaml
+++ b/charts/jenkins/templates/jenkins-controller-statefulset.yaml
@@ -345,8 +345,12 @@ spec:
 {{- if .Values.persistence.volumes }}
 {{ tpl (toYaml .Values.persistence.volumes | indent 6) . }}
 {{- end }}
+      {{- if .Values.controller.installPlugins }}
+      {{- if .Values.controller.overwritePluginsFromImage }}
       - name: plugins
         emptyDir: {}
+      {{- end }}
+      {{- end }}
       {{- if and .Values.controller.initScripts .Values.controller.initConfigMap }}
       - name: init-scripts
         projected:
diff --git a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
index a0e41e980..5ac5561c0 100644
--- a/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
+++ b/charts/jenkins/unittests/jenkins-controller-statefulset-test.yaml
@@ -575,3 +575,18 @@ tests:
     asserts:
       - matchSnapshot:
           path: spec.template.metadata.annotations
+  - it: 
+    template: jenkins-controller-statefulset.yaml
+    set:
+      controller:
+        installPlugins: false
+    asserts:
+      - notContains: 
+          path: spec.template.spec.volumes
+          content:
+            name: plugins
+            emptyDir: {}
+      - notContains:
+          path: spec.template.spec.initContainers[0].volumeMounts
+          content:
+            name: plugins
\ No newline at end of file