From 0e9aa00a5c482913b76ee61d2859b2b1286f1009 Mon Sep 17 00:00:00 2001 From: Jannis Oeltjen Date: Mon, 11 Feb 2019 10:19:59 +0100 Subject: [PATCH] [stable/jenkins] Add option to overwrite plugins (#11231) * [stable/jenkins] Add option to overwrite plugins Add an option to that will overwrite all installed plugins with their versions with the values provided via the Master.InstallPlugins parameter. Signed-off-by: Jannis Oeltjen * [stable/jenkins] bump version SemVer style Signed-off-by: Jannis Oeltjen --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/config.yaml | 4 ++++ stable/jenkins/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 580a0e733c..c5b521f538 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,6 +1,6 @@ name: jenkins home: https://jenkins.io/ -version: 0.30.0 +version: 0.31.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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index d0baf1ab36..192540b926 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -80,6 +80,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `Master.SecretsFilesSecret` | Kubernetes secret that contains 'secrets' files | Not set | | `Master.Jobs` | Jenkins XML job configs | Not set | | `Master.InstallPlugins` | List of Jenkins plugins to install | `kubernetes:1.14.0 workflow-aggregator:2.6 credentials-binding:1.17 git:3.9.1 workflow-job:2.31` | +| `Master.OverwritePlugins` | Overwrite installed plugins on start.| `false` | | `Master.EnableRawHtmlMarkupFormatter` | Enable HTML parsing using (see below) | Not set | | `Master.ScriptApproval` | List of groovy functions to approve | Not set | | `Master.NodeSelector` | Node labels for pod assignment | `{}` | diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index ebbf771cb9..3db7695c37 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -231,6 +231,10 @@ data: {{- end }} {{- end }} {{- end }} +{{- if .Values.Master.OverwritePlugins }} + # remove all plugins from shared volume + rm -rf /var/jenkins_home/plugins/* +{{- end }} {{- if .Values.Master.InstallPlugins }} # Install missing plugins cp /var/jenkins_config/plugins.txt /var/jenkins_home; diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 85f4355f89..65754ba0e1 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -138,6 +138,8 @@ Master: - credentials-binding:1.17 - git:3.9.1 + # Enable to always override the installed plugins with the values of 'Master.InstallPlugins' on upgrade or redeployment. + # OverwritePlugins: true # Enable HTML parsing using OWASP Markup Formatter Plugin (antisamy-markup-formatter), useful with ghprb plugin. # The plugin is not installed by default, please update Master.InstallPlugins. # EnableRawHtmlMarkupFormatter: true