710915952e
VAULT-571 Matching documented behavior and consul Consul's helm template defaults most of the enabled to the special value `"-"`, which means to inherit from global. This is what is implied should happen in Vault as well according to the documentation for the helm chart: > [global.enabled] The master enabled/disabled configuration. If this is > true, most components will be installed by default. If this is false, > no components will be installed by default and manually opting-in is > required, such as by setting server.enabled to true. (https://www.vaultproject.io/docs/platform/k8s/helm/configuration#enabled) We also simplified the chart logic using a few template helpers. Co-authored-by: Theron Voran <tvoran@users.noreply.github.com>
77 lines
No EOL
2.5 KiB
YAML
77 lines
No EOL
2.5 KiB
YAML
{{- if not .Values.global.openshift }}
|
|
{{ template "vault.mode" . }}
|
|
{{- if ne .mode "external" }}
|
|
{{- if .Values.server.ingress.enabled -}}
|
|
{{- $extraPaths := .Values.server.ingress.extraPaths -}}
|
|
{{- $serviceName := include "vault.fullname" . -}}
|
|
{{- template "vault.serverServiceEnabled" . -}}
|
|
{{- if .serverServiceEnabled -}}
|
|
{{- if and (eq .mode "ha" ) (eq (.Values.server.ingress.activeService | toString) "true") }}
|
|
{{- $serviceName = printf "%s-%s" $serviceName "active" -}}
|
|
{{- end }}
|
|
{{- $servicePort := .Values.server.service.port -}}
|
|
{{- $pathType := .Values.server.ingress.pathType -}}
|
|
{{- $kubeVersion := .Capabilities.KubeVersion.Version }}
|
|
{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
|
|
apiVersion: networking.k8s.io/v1
|
|
{{ else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
|
|
apiVersion: networking.k8s.io/v1beta1
|
|
{{ else }}
|
|
apiVersion: extensions/v1beta1
|
|
{{ end }}
|
|
kind: Ingress
|
|
metadata:
|
|
name: {{ template "vault.fullname" . }}
|
|
namespace: {{ .Release.Namespace }}
|
|
labels:
|
|
helm.sh/chart: {{ include "vault.chart" . }}
|
|
app.kubernetes.io/name: {{ include "vault.name" . }}
|
|
app.kubernetes.io/instance: {{ .Release.Name }}
|
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
|
{{- with .Values.server.ingress.labels }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
{{- template "vault.ingress.annotations" . }}
|
|
spec:
|
|
{{- if .Values.server.ingress.tls }}
|
|
tls:
|
|
{{- range .Values.server.ingress.tls }}
|
|
- hosts:
|
|
{{- range .hosts }}
|
|
- {{ . | quote }}
|
|
{{- end }}
|
|
secretName: {{ .secretName }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- if .Values.server.ingress.ingressClassName }}
|
|
ingressClassName: {{ .Values.server.ingress.ingressClassName }}
|
|
{{- end }}
|
|
rules:
|
|
{{- range .Values.server.ingress.hosts }}
|
|
- host: {{ .host | quote }}
|
|
http:
|
|
paths:
|
|
{{ if $extraPaths }}
|
|
{{ toYaml $extraPaths | indent 10 }}
|
|
{{- end }}
|
|
{{- range (.paths | default (list "/")) }}
|
|
- path: {{ . }}
|
|
{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
|
|
pathType: {{ $pathType }}
|
|
{{ end }}
|
|
backend:
|
|
{{ if semverCompare ">= 1.19.0-0" $kubeVersion }}
|
|
service:
|
|
name: {{ $serviceName }}
|
|
port:
|
|
number: {{ $servicePort }}
|
|
{{ else }}
|
|
serviceName: {{ $serviceName }}
|
|
servicePort: {{ $servicePort }}
|
|
{{ end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }} |