Enabling ingress and args on server

This commit is contained in:
Andrew Suderman 2020-02-26 16:10:47 -07:00
parent 05db948dd3
commit 0198257d53
No known key found for this signature in database
GPG key ID: 9C9CAE7EC2133DB7
3 changed files with 68 additions and 3 deletions

View file

@ -35,6 +35,9 @@ spec:
- "server"
- "--configmap"
- "{{ .Release.Name }}-{{ .Values.controller.name}}-configmap"
{{- range $name, $value := .Values.server.args }}
- --{{ $name }}={{ $value }}
{{- end }}
resources:
{{- toYaml .Values.server.resources | nindent 12 }}
{{- if .Values.server.metricsConfig.enabled }}

View file

@ -0,0 +1,32 @@
{{- if .Values.server.enabled -}}
{{- if .Values.server.ingress.enabled -}}
{{- $serviceName := printf "%s-%s" .Release.Name .Values.server.name -}}
{{- $servicePort := .Values.server.servicePort -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
name: {{ .Release.Name }}-{{ .Values.server.name }}
labels:
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
release: {{ .Release.Name }}
heritage: {{ .Release.Service }}
annotations:
{{- range $key, $value := .Values.server.ingress.annotations }}
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
rules:
{{- range .Values.server.ingress.hosts }}
- host: {{ . }}
http:
paths:
- backend:
serviceName: {{ $serviceName }}
servicePort: {{ $servicePort }}
{{- end -}}
{{- if .Values.server.ingress.tls }}
tls:
{{ toYaml .Values.server.ingress.tls | indent 4 }}
{{- end -}}
{{- end -}}
{{- end -}}

View file

@ -107,11 +107,19 @@ server:
name: server
image:
tag: ""
args: {}
# Use this to pass additional server args.
# Examples:
# auth-mode: hybrid
# basehref: ui
# podAnnotations is an optional map of annotations to be applied to the server Pods
podAnnotations: {}
# Optional labels to add to the server pods
podLabels: {}
# podPortName: http
metricsConfig:
enabled: false
path: /metrics
@ -139,6 +147,28 @@ server:
logging:
level: info
globallevel: "0"
ingress:
enabled: false
## Annotations to be added to the web ingress.
##
# annotations:
# kubernetes.io/ingress.class: nginx
# kubernetes.io/tls-acme: "true"
## Hostnames.
## Must be provided if Ingress is enabled.
##
# hosts:
# - argo.domain.com
## TLS configuration.
## Secrets must be manually created in the namespace.
##
# tls:
# - secretName: argo-ui-tls
# hosts:
# - argo.domain.com
ui:
enabled: true