From 8d21de9d76944391be213718a347da96ae09ea3f Mon Sep 17 00:00:00 2001 From: krishnakvall <65768477+krishnakvall@users.noreply.github.com> Date: Sat, 30 May 2020 02:05:33 +0530 Subject: [PATCH] [stable/jenkins] Allow templating of all string values except type for kubernetes volumes plugin xml (#22567) * feat(stable/jenkins): Allow templating of all string values except type for kubernetes volumes plugin xml Signed-off-by: Krishnakumar Venkataraman * [stable/jenkins]: merged latest and fixed comments for 1.23.2 Signed-off-by: Krishnakumar Venkataraman * [stable/jenkins]: fixed 1.23.0 and added 1.23.1 changelog Signed-off-by: Krishnakumar Venkataraman --- stable/jenkins/CHANGELOG.md | 8 ++++++++ stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/_helpers.tpl | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index 929a734e44..c13d04e121 100644 --- a/stable/jenkins/CHANGELOG.md +++ b/stable/jenkins/CHANGELOG.md @@ -5,6 +5,14 @@ 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.23.2 + +In the `jenkins.xml.podTemplate` helper function, allow templating of all string values under `agent.volumes` except `type` by rendering them with the `tpl` function + +## 1.23.1 + +Added auto detection for Ingress API version + ## 1.23.0 Allow to use an existing secret for the jenkins admin credentials diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 238a87ff45..3d5c4b5158 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.23.1 +version: 1.23.2 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/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl index f288c4ecdc..d97f8078c5 100644 --- a/stable/jenkins/templates/_helpers.tpl +++ b/stable/jenkins/templates/_helpers.tpl @@ -275,7 +275,7 @@ Returns kubernetes pod template xml configuration {{- end }} {{- range $key, $value := $volume }}{{- if not (eq $key "type") }} - <{{ $key }}>{{ $value }} + <{{ $key }}>{{ if kindIs "string" $value }}{{ tpl $value $ }}{{ else }}{{ $value }}{{ end }} {{- end }}{{- end }} {{- if (eq $volume.type "PVC") }}