stable/jenkins - Feature: Support Resource Root URL in Ingress (#23448)

* stable/jenkins - Feature: Support Resource Root URL in Ingress

Ref: https://wiki.jenkins.io/display/JENKINS/Configuring+Content+Security+Policy

Signed-off-by: Noel Georgi <git@frezbo.com>

* Bump chart version

Signed-off-by: Noel Georgi <git@frezbo.com>

* Fix backend indendation

Signed-off-by: Noel Georgi <git@frezbo.com>
This commit is contained in:
Noel Georgi
2020-08-21 00:59:39 -07:00
committed by GitHub
parent 506eedd8f3
commit fc651c44dd
3 changed files with 10 additions and 1 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
name: jenkins
home: https://jenkins.io/
version: 2.5.0
version: 2.5.1
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
View File
@@ -270,6 +270,7 @@ The following tables list the configurable parameters of the Jenkins chart and t
| `master.ingress.enabled` | Enables ingress | `false` |
| `master.ingress.apiVersion` | Ingress API version | `extensions/v1beta1` |
| `master.ingress.hostName` | Ingress host name | Not set |
| `master.ingress.resourceRootUrl` | Hostname to serve assets from | Not set |
| `master.ingress.annotations` | Ingress annotations | `{}` |
| `master.ingress.labels` | Ingress labels | `{}` |
| `master.ingress.path` | Ingress path | Not set |
@@ -38,6 +38,14 @@ spec:
{{- if .Values.master.ingress.hostName }}
host: {{ .Values.master.ingress.hostName | quote }}
{{- end }}
{{- if .Values.master.ingress.resourceRootUrl }}
- http:
paths:
- backend:
serviceName: {{ template "jenkins.fullname" . }}
servicePort: {{ .Values.master.servicePort }}
host: {{ .Values.master.ingress.resourceRootUrl | quote }}
{{- end }}
{{- if .Values.master.ingress.tls }}
tls:
{{ toYaml .Values.master.ingress.tls | indent 4 }}