[stable/jenkins] fix yaml template rendering in pod template JCasC (#21979)

Signed-off-by: Aaron McDonald <wmcdona89@gmail.com>
This commit is contained in:
Aaron McDonald
2020-04-17 12:05:07 -07:00
committed by GitHub
parent 5bbc323277
commit 4047074540
3 changed files with 8 additions and 2 deletions
+4
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.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.
+1 -1
View File
@@ -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
+3 -1
View File
@@ -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 -}}