From 868ec67e4300c32040d9ece15fd27054409ef34b Mon Sep 17 00:00:00 2001 From: wgj Date: Mon, 7 Oct 2019 11:17:10 -0600 Subject: [PATCH] [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 * Bumping patch version to satisfy lint-charts Signed-off-by: Weston Johnson * Updates changelog for #17372 Signed-off-by: Weston Johnson --- stable/jenkins/CHANGELOG.md | 4 ++++ stable/jenkins/Chart.yaml | 2 +- stable/jenkins/values.yaml | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index a94a63352b..d581376285 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/stable/jenkins/CHANGELOG.md @@ -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) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 020746cb03..77716d649c 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.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 diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 732c9a45ab..847343f46b 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -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: []