From c3bf9967dbb804cd1876e232fad833d4ccd4affb Mon Sep 17 00:00:00 2001 From: nareshnayini <36740198+nareshnayini@users.noreply.github.com> Date: Tue, 7 Jan 2020 14:12:19 -0500 Subject: [PATCH] fix overwriteConfig condition (#19910) Signed-off-by: naresh@getsidecar.com --- stable/jenkins/CHANGELOG.md | 4 ++++ stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/config.yaml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index 41a0c7d4b3..fa13f298c5 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/stable/jenkins/CHANGELOG.md @@ -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.13 + +Fix case sense in `Values.master.overwriteConfig` in `config.yaml` + ## 1.9.12 Scriptapprovals are overwritten when overwriteConfig is enabled diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 12123c6673..e9d3a302ec 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.9.12 +version: 1.9.13 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/templates/config.yaml b/stable/jenkins/templates/config.yaml index a4d9855a81..2611fb8b41 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -256,7 +256,7 @@ data: yes n | cp -i /usr/share/jenkins/ref/plugins/* /var/jenkins_plugins/; {{- end }} {{- if .Values.master.scriptApproval }} - {{- if .Values.Master.OverwriteConfig }} + {{- 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;