stable/jenkins - Changes as per JENKINS-47112 (helm#23429)

* Changes as per JENKINS-47112 Signed-off-by: Noel Georgi <git@frezbo.com> * Bump chart version Signed-off-by: Noel Georgi <git@frezbo.com> Signed-off-by: Miguel de Barros <miguel@debarros.me>
mdebarros · Aug 21, 2020 · 5232c05 · 5232c05
1 parent 2ae3b3b
commit 5232c05
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/stable/jenkins/CHANGELOG.md b/stable/jenkins/CHANGELOG.md
@@ -5,6 +5,14 @@ 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.5.2
+
+Fix as per JENKINS-47112
+
+## 2.5.1
+
+Support Jenkins Resource Root URL
+
 ## 2.5.0
 
 Add an option to specify that Jenkins master should be initialized only once, during first install.

diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: jenkins
 home: https://jenkins.io/
-version: 2.5.1
+version: 2.5.2
 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/stable/jenkins/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl
@@ -175,13 +175,13 @@ Returns kubernetes pod template configuration as code
     command: {{ .Values.agent.command }}
     {{- end }}
     envVars:
-    - containerEnvVar:
-        key: "JENKINS_URL"
-    {{- if .Values.master.slaveJenkinsUrl }}
-        value: {{ tpl .Values.master.slaveJenkinsUrl . }}
-    {{- else }}
-        value: "http://{{ template "jenkins.fullname" . }}.{{ template "jenkins.namespace" . }}.svc.{{.Values.clusterZone}}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }}"
-    {{- end }}
+      - envVar:
+          key: "JENKINS_URL"
+          {{- if .Values.master.slaveJenkinsUrl }}
+          value: {{ tpl .Values.master.slaveJenkinsUrl . }}
+          {{- else }}
+          value: "http://{{ template "jenkins.fullname" . }}.{{ template "jenkins.namespace" . }}.svc.{{.Values.clusterZone}}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }}"
+          {{- end }}
     {{- if .Values.agent.imageTag }}
     image: "{{ .Values.agent.image }}:{{ .Values.agent.imageTag }}"
     {{- else }}