From 1c04a42f8d87f87f7fc73ce49da6d795048c8991 Mon Sep 17 00:00:00 2001 From: vir2albulb Date: Sun, 5 Apr 2020 16:35:45 +0200 Subject: [PATCH] [stable/jenkins]: Define jenkinsHome variable to use in range blocks (#21757) * stable/jenkins: Define jenkinsHome variable to use in range blocks Signed-off-by: Jakub Marciniak * stable/jenkins: Use jenkinsHome variable only inside range blocks Signed-off-by: Jakub Marciniak --- stable/jenkins/CHANGELOG.md | 8 ++++++-- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/templates/config.yaml | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index f5bca522c6..bef9766c21 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.11.1 Support for master.additionalConfig + +Fixed a bug with jenkinsHome variable in range block when master.additionalConfig is set - Helm cannot evaluate field Values in type interface {}. + ## 1.11.0 Add support for configuring custom pod templates Add `agent.podTemplates` option for declaring custom pod templates in the default configured kubernetes cloud. @@ -115,8 +119,8 @@ Google application credentials are kept in a file, which has to be mounted to a jenkins-service-account: gcpcredentials: application_default_credentials.json ``` - -Helm template then creates the necessary volume mounts and `GOOGLE_APPLICATION_CREDENTIALS` environmental variable. + +Helm template then creates the necessary volume mounts and `GOOGLE_APPLICATION_CREDENTIALS` environmental variable. ## 1.9.3 Fix `JAVA_OPTS` when config auto-reload is enabled diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 4d753e5749..cc1b2d1e8e 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.11.0 +version: 1.11.1 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/config.yaml b/stable/jenkins/templates/config.yaml index 0ac142061f..7dcb215e75 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -1,4 +1,5 @@ {{- if not .Values.master.customConfigMap }} +{{- $jenkinsHome := .Values.master.jenkinsHome -}} apiVersion: v1 kind: ConfigMap @@ -229,7 +230,7 @@ data: cp /var/jenkins_config/jenkins.model.JenkinsLocationConfiguration.xml {{ .Values.master.jenkinsHome }}; {{- if .Values.master.additionalConfig }} {{- range $key, $val := .Values.master.additionalConfig }} - cp /var/jenkins_config/{{- $key }} {{ .Values.master.jenkinsHome }}; + cp /var/jenkins_config/{{- $key }} {{ $jenkinsHome }}; {{- end }} {{- end }} {{- else }} @@ -238,7 +239,7 @@ data: yes n | cp -i /var/jenkins_config/jenkins.model.JenkinsLocationConfiguration.xml {{ .Values.master.jenkinsHome }}; {{- if .Values.master.additionalConfig }} {{- range $key, $val := .Values.master.additionalConfig }} - yes n | cp -i /var/jenkins_config/{{- $key }} {{ .Values.master.jenkinsHome }}; + yes n | cp -i /var/jenkins_config/{{- $key }} {{ $jenkinsHome }}; {{- end }} {{- end }} {{- end }}