Skip to content

Commit

Permalink
[stable/jenkins] Fix master.slaveJenkinsUrl (helm#23176)
Browse files Browse the repository at this point in the history
Fixes helm#22708

Signed-off-by: Torsten Walter <[email protected]>
  • Loading branch information
Torsten Walter authored and KinsheX committed Jul 20, 2020
1 parent fb13ada commit 0da0aba
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions stable/jenkins/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion stable/jenkins/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion stable/jenkins/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down

0 comments on commit 0da0aba

Please sign in to comment.