copy scriptapprovals when overwriteConfig enabled (#19734)

Signed-off-by: Jan Heylen <jan.heylen@nokia.com>
This commit is contained in:
Jan Heylen
2020-01-02 14:07:41 -08:00
committed by Kubernetes Prow Robot
parent da66326e37
commit 9caa79daf6
3 changed files with 9 additions and 1 deletions
+4
View File
@@ -5,6 +5,10 @@ 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.
## 1.9.12
Scriptapprovals are overwritten when overwriteConfig is enabled
## 1.9.10
Added documentation for `persistence.storageClass`.
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: jenkins
home: https://jenkins.io/
version: 1.9.11
version: 1.9.12
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
+4
View File
@@ -256,7 +256,11 @@ data:
yes n | cp -i /usr/share/jenkins/ref/plugins/* /var/jenkins_plugins/;
{{- end }}
{{- if .Values.master.scriptApproval }}
{{- if .Values.Master.OverwriteConfig }}
cp /var/jenkins_config/scriptapproval.xml /var/jenkins_home/scriptApproval.xml;
{{- else }}
yes n | cp -i /var/jenkins_config/scriptapproval.xml /var/jenkins_home/scriptApproval.xml;
{{- end }}
{{- end }}
{{- if .Values.master.initScripts }}
mkdir -p /var/jenkins_home/init.groovy.d/;