fix: add ingress.resourceRootUrl to ingress' spec.tls.hosts (#1588)

Author: lemeurherve

charts/jenkins/CHANGELOG.md

@@ -12,6 +12,10 @@ Use the following links to reference issues, PRs, and commits prior to v2.6.0.
 The changelog until v1.5.7 was auto-generated based on git commits.
 Those entries include a reference to the git commit to be able to get more details.
 
+## 5.8.128
+
+Add `ingress.resourceRootUrl` to ingress' `spec.tls.hosts`
+
 ## 5.8.127
 
 Update `jenkins/inbound-agent` to version `3355.v388858a_47b_33-6`

charts/jenkins/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: jenkins
 type: application
 home: https://www.jenkins.io/
-version: 5.8.127
+version: 5.8.128
 appVersion: 2.541.1
 description: >
   Jenkins - Build great things at any scale! As the leading open source automation server, Jenkins provides over 2000 plugins to support building, deploying and automating any project.

charts/jenkins/templates/jenkins-controller-ingress.yaml

@@ -66,6 +66,15 @@ spec:
 {{- end }}
 {{- if .Values.controller.ingress.tls }}
   tls:
-{{ tpl (toYaml .Values.controller.ingress.tls ) . | indent 4 }}
-{{- end -}}
+{{- range .Values.controller.ingress.tls }}
+  - hosts:
+{{- range .hosts }}
+      - {{ tpl . $ | quote }}
+{{- end }}
+{{- if $.Values.controller.ingress.resourceRootUrl }}
+      - {{ tpl $.Values.controller.ingress.resourceRootUrl $ | quote }}
+{{- end }}
+    secretName: {{ .secretName | quote }}
+{{- end }}
+{{- end }}
 {{- end }}

charts/jenkins/unittests/jenkins-controller-ingress-DRY-test.yaml

@@ -10,17 +10,22 @@ tests:
     template: jenkins-controller-ingress.yaml
     set:
       global.jenkinsHostname: "jenkins.example.com"
+      global.resourceRootUrlHostname: "assets.jenkins.example.com"
       controller.ingress:
         enabled: true
         hostName: "{{ .Values.global.jenkinsHostname }}"
         resourceRootUrl: "{{ .Values.global.jenkinsHostname }}"
         tls:
           - hosts:
               - "{{ .Values.global.jenkinsHostname }}"
+              - "{{ .Values.global.resourceRootUrlHostname }}"
     asserts:
       - equal:
           path: spec.rules[0].host
           value: "jenkins.example.com"
       - equal:
           path: spec.tls[0].hosts[0]
           value: "jenkins.example.com"
+      - equal:
+          path: spec.tls[0].hosts[1]
+          value: "assets.jenkins.example.com"