github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/jenkins]: Define jenkinsHome variable to use in range blocks (#21757)

Browse Source 
* stable/jenkins: Define jenkinsHome variable to use in range blocks

Signed-off-by: Jakub Marciniak <jakub.marciniak@alfa.pl>

* stable/jenkins: Use jenkinsHome variable only inside range blocks

Signed-off-by: Jakub Marciniak <jakub.marciniak@alfa.pl>
This commit is contained in:
vir2albulb
2020-04-05 07:35:45 -07:00
committed by GitHub
parent 15a0fdf98d
commit 1c04a42f8d
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/jenkins/CHANGELOG.md
+6 -2
View File
@@ -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
stable/jenkins/Chart.yaml
+1 -1
View File
@@ -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
stable/jenkins/templates/config.yaml
+3 -2
View File
@@ -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 }}