1b680d3a54
This patch allows tls to be enabled with an empty secretName for ingress controllers might be able to provide a default certificate. Fixes #5858, provides better defaults for the Ingress object and allows TLS to be enabled with an empty secretName. ### Motivation The current helm chart can create an Ingress with TLS, but it requires a secretName to be added. This is not an Ingress requirement and, in some cases, the ingress controller can provide a default certificate when the Ingress object does not declare one. ### Modifications Modifications include `values.yaml` and `dashboard-ingress.yaml` to address the issue.
54 lines
2.9 KiB
YAML
54 lines
2.9 KiB
YAML
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one
|
|
# or more contributor license agreements. See the NOTICE file
|
|
# distributed with this work for additional information
|
|
# regarding copyright ownership. The ASF licenses this file
|
|
# to you under the Apache License, Version 2.0 (the
|
|
# "License"); you may not use this file except in compliance
|
|
# with the License. You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing,
|
|
# software distributed under the License is distributed on an
|
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
# KIND, either express or implied. See the License for the
|
|
# specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
{{- if .Values.dashboard.ingress.enabled }}
|
|
apiVersion: extensions/v1beta1
|
|
kind: Ingress
|
|
metadata:
|
|
labels:
|
|
app: {{ template "pulsar.name" . }}
|
|
chart: {{ template "pulsar.chart" . }}
|
|
release: {{ .Release.Name }}
|
|
heritage: {{ .Release.Service }}
|
|
cluster: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
|
|
annotations:
|
|
{{- with .Values.dashboard.ingress.annotations }}
|
|
{{ toYaml . | indent 4 }}
|
|
{{- end }}
|
|
name: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
|
|
namespace: {{ .Values.namespace }}
|
|
spec:
|
|
{{- if .Values.dashboard.ingress.tls.enabled }}
|
|
tls:
|
|
- hosts:
|
|
- {{ .Values.dashboard.ingress.hostname }}
|
|
{{- with .Values.dashboard.ingress.tls.secretName }}
|
|
secretName: {{ . }}
|
|
{{- end }}
|
|
{{- end }}
|
|
rules:
|
|
- host: {{ required "Dashboard ingress hostname not provided" .Values.dashboard.ingress.hostname }}
|
|
http:
|
|
paths:
|
|
- path: {{ .Values.dashboard.ingress.path }}
|
|
backend:
|
|
serviceName: "{{ template "pulsar.fullname" . }}-{{ .Values.dashboard.component }}"
|
|
servicePort: {{ .Values.dashboard.ingress.port }}
|
|
{{- end }}
|