[stable/jenkins] Fix overwritePluginsFromImage and syntax error (helm…

…#23175) Setting overwritePluginsFromImage: Fixes helm#23003 Fixes helm#22633 Correcting indentation Fixes helm#23114 Signed-off-by: Torsten Walter <[email protected]> Signed-off-by: Adrien Loiseau <[email protected]>
li-adrienloiseau · Jul 29, 2020 · 0700293 · 0700293
1 parent e67af28
commit 0700293
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,13 @@ numbering uses [semantic versioning](http://semver.org).
 
 NOTE: The change log until version 1.5.7 is auto generated based on git commits. Those include a reference to the git commit to be able to get more details.
 
+## 2.3.2 Fix wrong value for overwritePluginsFromImage
+
+Fixes #23003
+Fixes #22633
+
+Also fixes indentation for #23114
+
 ## 2.3.1
 
 Always mount {{ .Values.master.jenkinsRef }}/secrets/ directory. Previous it

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.3.1
+version: 2.3.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

diff --git a/stable/jenkins/ci/other-values.yaml b/stable/jenkins/ci/other-values.yaml
@@ -17,6 +17,10 @@ master:
                 attributeName: "memberOf"
   additionalPlugins:
     - ldap:1.24
+  scriptApproval:
+    - "method groovy.json.JsonSlurperClassic parseText java.lang.String"
+    - "new groovy.json.JsonSlurperClassic"
+
 persistence:
   enabled: false
 

diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml
@@ -210,7 +210,7 @@ data:
     yes n | cp -i {{ .Values.master.jenkinsRef }}/plugins/* /var/jenkins_plugins/;
 {{- end }}
 {{- if .Values.master.scriptApproval }}
-  echo "configure script approval"
+    echo "configure script approval"
   {{- if .Values.master.overwriteConfig }}
     cp /var/jenkins_config/scriptapproval.xml {{ .Values.master.jenkinsHome }}/scriptApproval.xml;
   {{- else }}

diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml
@@ -239,7 +239,7 @@ master:
   # overwritePlugins: true
 
   # Configures if plugins bundled with `master.image` should be overwritten with the values of 'master.installPlugins' on upgrade or redeployment.
-  master.overwritePluginsFromImage: true
+  overwritePluginsFromImage: true
 
   # Enable HTML parsing using OWASP Markup Formatter Plugin (antisamy-markup-formatter), useful with ghprb plugin.
   # The plugin is not installed by default, please update master.installPlugins.