diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index cd0f6b8a74..3e1964250c 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/stable/jenkins/CHANGELOG.md @@ -5,13 +5,17 @@ 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.10.0 Remove configuration-as-code-support plugins + +In recent version of configuration-as-code-plugin this is no longer necessary. + ## 1.9.24 Update JCasC auto-reload docs and remove stale ssh key references from version "1.8.0 JCasC auto reload works without ssh keys" -## 1.9.23 +## 1.9.23 Support jenkinsUriPrefix when JCasC is enabled -Add jenkinsUriPrefix to casc reload uri +Fixed a bug in the configuration as code reload url, where it wouldn't work with a jenkinsUriPrefix set. ## 1.9.22 diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 74cb3524fd..2ce85090ea 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.24 +version: 1.10.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 81904c9834..e92c8f7590 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -67,7 +67,7 @@ The following tables list the configurable parameters of the Jenkins chart and t | `master.image` | Master image name | `jenkins/jenkins` | | `master.tag` | Master image tag | `lts` | | `master.imagePullPolicy` | Master image pull policy | `Always` | -| `master.imagePullSecret` | Master image pull secret | Not set | +| `master.imagePullSecretName` | Master image pull secret | Not set | | `master.numExecutors` | Set Number of executors | 0 | | `master.customJenkinsLabels` | Append Jenkins labels to the master | `{}` | | `master.useSecurity` | Use basic security | `true` | @@ -201,7 +201,7 @@ Some third-party systems, e.g. GitHub, use HTML-formatted data in their payload | `agent.customJenkinsLabels`| Append Jenkins labels to the agent | `{}` | | `agent.enabled` | Enable Kubernetes plugin jnlp-agent podTemplate | `true` | | `agent.image` | Agent image name | `jenkins/jnlp-slave` | -| `agent.imagePullSecret` | Agent image pull secret | Not set | +| `agent.imagePullSecretName` | Agent image pull secret | Not set | | `agent.tag` | Agent image tag | `3.27-1` | | `agent.privileged` | Agent privileged container | `false` | | `agent.resources` | Resources allocation (Requests and Limits) | `{requests: {cpu: 512m, memory: 512Mi}, limits: {cpu: 512m, memory: 512Mi}}`| @@ -371,7 +371,7 @@ master: configAutoReload: enabled: true rbac: - install: true + create: true ``` ## RBAC diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index 4166cc7838..5eca730a25 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -322,11 +322,6 @@ data: {{- if not (contains "configuration-as-code" (quote .Values.master.installPlugins)) }} configuration-as-code:{{ .Values.master.JCasC.pluginVersion }} {{- end }} - {{- if semverCompare "<=1.19" (printf "%v" .Values.master.JCasC.pluginVersion) }} - {{- if not (contains "configuration-as-code-support" (quote .Values.master.installPlugins)) }} - configuration-as-code-support:{{ .Values.master.JCasC.supportPluginVersion }} - {{- end }} - {{- end }} {{- end }} {{- end }} {{ else }} diff --git a/stable/jenkins/values.yaml b/stable/jenkins/values.yaml index 1eb805c5cc..feba0ed772 100644 --- a/stable/jenkins/values.yaml +++ b/stable/jenkins/values.yaml @@ -253,9 +253,6 @@ master: enabled: false defaultConfig: false pluginVersion: "1.36" - # it's only used when plugin version is <=1.18 for later version the - # configuration as code support plugin is no longer needed - supportPluginVersion: "1.18" configScripts: {} # welcome-message: | # jenkins: