From 673e4c87918d5d95b6aa49c2f8ef5c36065ce507 Mon Sep 17 00:00:00 2001 From: Torsten Walter Date: Tue, 14 Jul 2020 11:13:20 +0200 Subject: [PATCH] [stable/jenkins] Fix master.slaveJenkinsUrl (#23176) Fixes #22708 Signed-off-by: Torsten Walter --- charts/jenkins/CHANGELOG.md | 4 ++++ charts/jenkins/Chart.yaml | 2 +- charts/jenkins/templates/_helpers.tpl | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/jenkins/CHANGELOG.md b/charts/jenkins/CHANGELOG.md index 49e53f4d9a90..efdb9f64047c 100644 --- 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 index be945e91b77e..d867a298e4ce 100644 --- 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 index 6dd2bbc00902..34d37433b606 100644 --- 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 }}