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

Fixes #22708

Signed-off-by: Torsten Walter <torsten.walter@syncier.com>
This commit is contained in:
Torsten Walter
2020-07-14 02:13:20 -07:00
committed by GitHub
parent 3aabb24ac5
commit b78b82d388
3 changed files with 6 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.
## 2.3.3 correct templating of master.slaveJenkinsUrl
Fixes #22708
## 2.3.2 Fix wrong value for overwritePluginsFromImage
Fixes #23003
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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 }}