[stable/jenkins] Comments out JCasC welcome message (#17372)

* Comments out JCasC welcome message

Allows users to override welcome-message as JCasC doesn't handle conflicting
configurations.
Fixes #13333

Signed-off-by: Weston Johnson <wes@futureprefect.com>

* Bumping patch version to satisfy lint-charts

Signed-off-by: Weston Johnson <wes@futureprefect.com>

* Updates changelog for #17372

Signed-off-by: Weston Johnson <wes@futureprefect.com>
This commit is contained in:
wgj
2019-10-07 10:17:10 -07:00
committed by Kubernetes Prow Robot
parent e31fa8672b
commit 868ec67e43
3 changed files with 8 additions and 4 deletions
+4
View File
@@ -6,6 +6,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.7.4
Comments out JCasC example of jenkins.systemMessage so that it can be used by end users. Previously, an attempt to set systemMessage causes Jenkins to startup, citing duplicate JCasC settings for systemMessage [issue #13333](https://github.com/helm/charts/issues/13333)
## 1.7.2
Update kubernetes-plugin to version 1.18.2 which fixes frequently encountered [JENKINS-59000](https://issues.jenkins-ci.org/plugins/servlet/mobile#issue/JENKINS-59000)
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: jenkins
home: https://jenkins.io/
version: 1.7.3
version: 1.7.4
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
+3 -3
View File
@@ -206,9 +206,9 @@ master:
# configuration as code support plugin is no longer needed
supportPluginVersion: "1.18"
configScripts:
welcome-message: |
jenkins:
systemMessage: Welcome to our CI\CD server. This Jenkins is configured and managed 'as code'.
# welcome-message: |
# jenkins:
# systemMessage: Welcome to our CI\CD server. This Jenkins is configured and managed 'as code'.
# Optionally specify additional init-containers
customInitContainers: []