diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index 73383a42fe..fe824896e8 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.16.0 + +Add `master.overwritePluginsFromImage` to allow support for jenkins plugins installed in the master image to persist. + ## 1.15.0 Update plugin versions & sidecar container | plugin | old version | new version | diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 9773ee3e05..82d8f83273 100644 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.15.0 +version: 1.16.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 860f695ee0..e8a19b0be2 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -151,6 +151,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `master.overwriteJobs` | Replace jobs w/ ConfigMap on boot | `false` | | `master.installPlugins` | List of Jenkins plugins to install. If you don't want to install plugins set it to `[]` | `kubernetes:1.18.2 workflow-aggregator:2.6 credentials-binding:1.19 git:3.11.0 workflow-job:2.33` | | `master.overwritePlugins` | Overwrite installed plugins on start.| `false` | +| `master.overwritePluginsFromImage` | Keep plugins that are already installed in the master image.| `true` | | `master.enableRawHtmlMarkupFormatter` | Enable HTML parsing using (see below) | false | | `master.scriptApproval` | List of groovy functions to approve | `[]` | | `master.nodeSelector` | Node labels for pod assignment | `{}` | diff --git a/stable/jenkins/ci/other-values.yaml b/stable/jenkins/ci/other-values.yaml index f9c0c116e8..edba8578ae 100644 --- a/stable/jenkins/ci/other-values.yaml +++ b/stable/jenkins/ci/other-values.yaml @@ -1,3 +1,5 @@ +master: + overwritePluginsFromImage: false agent: resources: limits: diff --git a/stable/jenkins/templates/jenkins-master-deployment.yaml b/stable/jenkins/templates/jenkins-master-deployment.yaml index 4278c3f129..1339472d78 100644 --- a/stable/jenkins/templates/jenkins-master-deployment.yaml +++ b/stable/jenkins/templates/jenkins-master-deployment.yaml @@ -147,8 +147,10 @@ spec: readOnly: true {{- end }} {{- if .Values.master.installPlugins }} + {{- if .Values.master.overwritePluginsFromImage }} - mountPath: {{ .Values.master.jenkinsRef }}/plugins name: plugins + {{- end }} - mountPath: /var/jenkins_plugins name: plugin-dir {{- end }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 170ec9ef8a..7b9e8579fe 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -220,6 +220,10 @@ master: # Enable to always override the installed plugins with the values of 'master.installPlugins' on upgrade or redeployment. # overwritePlugins: true + + # Configures if plugins bundled with `master.image` should be overwritten with the values of 'master.installPlugins' on upgrade or redeployment. + master.overwritePluginsFromImage: 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: false