diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md index df5f61cb06..1ac1831b4e 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.13.1 + +Fix yaml template rendering in kubernetes pod template JCasC + ## 1.13.0 Add `master.networkPolicy.internalAgents` and `master.networkPolicy.externalAgents` stanzas to fine grained controls over where internal/external agents can connect from. Internal ones are allowed based on pod labels and (optionally) namespaces, and external ones are allowed based on IP ranges. diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 0189a49a11..8327464baa 100644 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.13.0 +version: 1.13.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/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl index 0d7a4aa937..d67761b80a 100644 --- a/stable/jenkins/templates/_helpers.tpl +++ b/stable/jenkins/templates/_helpers.tpl @@ -178,8 +178,10 @@ Returns kubernetes pod template configuration as code showRawYaml: true serviceAccount: "{{ include "jenkins.serviceAccountAgentName" . }}" slaveConnectTimeoutStr: "{{ .Values.agent.slaveConnectTimeout }}" + {{- if .Values.agent.yamlTemplate }} yaml: |- - {{ tpl .Values.agent.yamlTemplate . | nindent 10 | trim }} + {{- tpl ( trim .Values.agent.yamlTemplate ) . | nindent 4 }} + {{- end }} yamlMergeStrategy: "override" {{- end -}}