jenkins: update to 2.568.1 LTS and chart
Change-Id: Ib6b48599a09dee669d77441c12b354240ef257b8
diff --git a/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml b/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
index c63e482..876b75d 100644
--- a/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
+++ b/charts/jenkins/templates/jenkins-controller-secondary-ingress.yaml
@@ -13,26 +13,21 @@
metadata:
namespace: {{ template "jenkins.namespace" . }}
labels:
- "app.kubernetes.io/name": '{{ template "jenkins.name" .}}'
- {{- if .Values.renderHelmLabels }}
- "helm.sh/chart": "{{ template "jenkins.label" .}}"
- {{- end }}
- "app.kubernetes.io/managed-by": "{{ .Release.Service }}"
- "app.kubernetes.io/instance": "{{ .Release.Name }}"
- "app.kubernetes.io/component": "{{ .Values.controller.componentName }}"
+ {{- include "jenkins.labels" . | nindent 4 }}
{{- if .Values.controller.secondaryingress.labels -}}
{{ toYaml .Values.controller.secondaryingress.labels | nindent 4 }}
{{- end }}
{{- if .Values.controller.secondaryingress.annotations }}
- annotations: {{ toYaml .Values.controller.secondaryingress.annotations | nindent 4 }}
+ annotations:
+{{ tpl (toYaml .Values.controller.secondaryingress.annotations) . | indent 4 }}
{{- end }}
name: {{ template "jenkins.fullname" . }}-secondary
spec:
{{- if .Values.controller.secondaryingress.ingressClassName }}
- ingressClassName: {{ .Values.controller.secondaryingress.ingressClassName | quote }}
+ ingressClassName: {{ tpl .Values.controller.secondaryingress.ingressClassName . | quote }}
{{- end }}
rules:
- - host: {{ .Values.controller.secondaryingress.hostName }}
+ - host: {{ tpl .Values.controller.secondaryingress.hostName . | quote }}
http:
paths:
{{- range .Values.controller.secondaryingress.paths }}
@@ -43,14 +38,30 @@
name: {{ $serviceName }}
port:
number: {{ $servicePort }}
- pathType: ImplementationSpecific
+ pathType: {{ $.Values.controller.secondaryingress.pathType }}
{{ else }}
serviceName: {{ $serviceName }}
servicePort: {{ $servicePort }}
{{ end }}
{{- end}}
{{- if .Values.controller.secondaryingress.tls }}
+{{- $withTlsEntries := false }}
+{{- range .Values.controller.secondaryingress.tls }}
+ {{- if gt (len .) 0 }}
+ {{- $withTlsEntries = true }}
+ {{- end }}
+{{- end }}
+{{- if $withTlsEntries }}
tls:
-{{ toYaml .Values.controller.secondaryingress.tls | indent 4 }}
+{{- range .Values.controller.secondaryingress.tls }}
+ - hosts:
+{{- range .hosts }}
+ - {{ tpl . $ | quote }}
+{{- end }}
+{{- if .secretName }}
+ secretName: {{ tpl (.secretName | toString) $ | quote }}
+{{- end }}
+{{- end }}
+{{- end }}
{{- end -}}
{{- end }}