From fc651c44dd3e3fbcfbe0fc00bd1feb5773b18bbf Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Fri, 21 Aug 2020 13:29:39 +0530 Subject: [PATCH] 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 * Bump chart version Signed-off-by: Noel Georgi * Fix backend indendation Signed-off-by: Noel Georgi --- stable/jenkins/Chart.yaml | 2 +- stable/jenkins/README.md | 1 + stable/jenkins/templates/jenkins-master-ingress.yaml | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stable/jenkins/Chart.yaml b/stable/jenkins/Chart.yaml index 96cfefaa07..acdeeef1c9 100644 --- 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.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 diff --git a/stable/jenkins/README.md b/stable/jenkins/README.md index 7a1d2b4c00..14e2fa972d 100644 --- a/stable/jenkins/README.md +++ b/stable/jenkins/README.md @@ -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 | diff --git a/stable/jenkins/templates/jenkins-master-ingress.yaml b/stable/jenkins/templates/jenkins-master-ingress.yaml index cc0758bcdb..ad00a720bf 100644 --- a/stable/jenkins/templates/jenkins-master-ingress.yaml +++ b/stable/jenkins/templates/jenkins-master-ingress.yaml @@ -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 }}