diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index e440e718a6..ce59b71621 100755 --- a/stable/jenkins/Chart.yaml +++ b/stable/jenkins/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: jenkins home: https://jenkins.io/ -version: 1.5.2 +version: 1.5.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/stable/jenkins/templates/_helpers.tpl b/stable/jenkins/templates/_helpers.tpl index 5e740753b7..1cd28df879 100644 --- a/stable/jenkins/templates/_helpers.tpl +++ b/stable/jenkins/templates/_helpers.tpl @@ -48,6 +48,25 @@ If release name contains chart name it will be used as a full name. {{- end -}} {{- end -}} +{{/* +Returns the Jenkins URL +*/}} +{{- define "jenkins.url" -}} +{{- if .Values.master.jenkinsUrl }} + {{- .Values.master.jenkinsUrl }} +{{- else }} + {{- if .Values.master.ingress.hostName }} + {{- if .Values.master.ingress.tls }} + {{- default "https" .Values.master.jenkinsUrlProtocol }}://{{ .Values.master.ingress.hostName }}{{ default "" .Values.master.jenkinsUriPrefix }} + {{- else }} + {{- default "http" .Values.master.jenkinsUrlProtocol }}://{{ .Values.master.ingress.hostName }}{{ default "" .Values.master.jenkinsUriPrefix }} + {{- end }} + {{- else }} + {{- default "http" .Values.master.jenkinsUrlProtocol }}://{{ template "jenkins.fullname" . }}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }} + {{- end}} +{{- end}} +{{- end -}} + {{- define "jenkins.kubernetes-version" -}} {{- if .Values.master.installPlugins -}} {{- range .Values.master.installPlugins -}} diff --git a/stable/jenkins/templates/config.yaml b/stable/jenkins/templates/config.yaml index 867d899d97..75d1789315 100644 --- a/stable/jenkins/templates/config.yaml +++ b/stable/jenkins/templates/config.yaml @@ -200,19 +200,7 @@ data: {{ default "" .Values.master.jenkinsAdminEmail }} -{{- if .Values.master.jenkinsUrl }} - {{ .Values.master.jenkinsUrl }} -{{- else }} - {{- if .Values.master.ingress.hostName }} - {{- if .Values.master.ingress.tls }} - {{ default "https" .Values.master.jenkinsUrlProtocol }}://{{ .Values.master.ingress.hostName }}{{ default "" .Values.master.jenkinsUriPrefix }} - {{- else }} - {{ default "http" .Values.master.jenkinsUrlProtocol }}://{{ .Values.master.ingress.hostName }}{{ default "" .Values.master.jenkinsUriPrefix }} - {{- end }} - {{- else }} - {{ default "http" .Values.master.jenkinsUrlProtocol }}://{{ template "jenkins.fullname" . }}:{{.Values.master.servicePort}}{{ default "" .Values.master.jenkinsUriPrefix }} - {{- end}} -{{- end}} + {{ template "jenkins.url" . }} jenkins.CLI.xml: |-