[stable/jenkins] Fix master.slaveJenkinsUrl (helm#23176)

Fixes helm#22708 Signed-off-by: Torsten Walter <[email protected]>
wmcdona89 · Jul 14, 2020 · 673e4c8 · 673e4c8
1 parent 5ef0ab8
commit 673e4c8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/charts/jenkins/CHANGELOG.md b/charts/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.
 
+## 2.3.3 correct templating of master.slaveJenkinsUrl
+
+Fixes #22708
+
 ## 2.3.2 Fix wrong value for overwritePluginsFromImage
 
 Fixes #23003

diff --git a/charts/jenkins/Chart.yaml b/charts/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.3.2
+version: 2.3.3
 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/charts/jenkins/templates/_helpers.tpl b/charts/jenkins/templates/_helpers.tpl
@@ -103,7 +103,7 @@ jenkins:
       connectTimeout: "{{ .Values.master.slaveConnectTimeout }}"
       readTimeout: "{{ .Values.master.slaveReadTimeout }}"
       {{- if .Values.master.slaveJenkinsUrl }}
-      jenkinsUrl: "{{ tpl .Values.master.slaveJenkinsUrl }}"
+      jenkinsUrl: "{{ tpl .Values.master.slaveJenkinsUrl . }}"
       {{- else if .Values.master.slaveKubernetesNamespace }}
       jenkinsUrl: "http://{{ template "jenkins.fullname" . }}.{{ template "jenkins.namespace" . }}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }}"
       {{- else }}