Jenkins OverwriteConfig setting also overwrites init scripts (#9468)

* Jenkins OverwriteConfig setting also overwrites init scripts

Signed-off-by: William Hutson <wilrnh@msn.com>

* fixed indentation

Signed-off-by: William Hutson <wilrnh@msn.com>
This commit is contained in:
William Hutson
2019-03-17 09:10:54 -07:00
committed by Kubernetes Prow Robot
parent a2e998be1a
commit 501335b764
4 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: jenkins
home: https://jenkins.io/
version: 0.34.1
version: 0.35.0
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
+1 -1
View File
@@ -72,7 +72,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `Master.LoadBalancerIP` | Optional fixed external IP | Not set |
| `Master.JMXPort` | Open a port, for JMX stats | Not set |
| `Master.ExtraPorts` | Open extra ports, for other uses | Not set |
| `Master.OverwriteConfig` | Replace config w/ ConfigMap on boot | `false` |
| `Master.OverwriteConfig` | Replace init scripts and config w/ ConfigMap on boot | `false` |
| `Master.ingress.enabled` | Enables ingress | `false` |
| `Master.ingress.hostName` | Ingress host name | Not set |
| `Master.ingress.annotations` | Ingress annotations | `{}` |
+3
View File
@@ -258,6 +258,9 @@ data:
{{- end }}
{{- if .Values.Master.InitScripts }}
mkdir -p /var/jenkins_home/init.groovy.d/;
{{- if .Values.Master.OverwriteConfig }}
rm -f /var/jenkins_home/init.groovy.d/*.groovy
{{- end }}
yes n | cp -i /var/jenkins_config/*.groovy /var/jenkins_home/init.groovy.d/;
{{- end }}
{{- if .Values.Master.JCasC.enabled }}
+1
View File
@@ -246,6 +246,7 @@ Master:
# By default, the configMap is only used to set the initial config the first time
# that the chart is installed. Setting `OverwriteConfig` to `true` will overwrite
# the jenkins config with the contents of the configMap every time the pod starts.
# This will also overwrite all init scripts
OverwriteConfig: false
ingress: