Add ingress for argo-ui (#18)
* Fix bug in ui-crb.yaml and add ingress for argo-ui * Use crd.version value and add ability to specify crd creation job sa
This commit is contained in:
parent
61d426c1ca
commit
2320338591
5 changed files with 63 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
description: A Helm chart for Kubernetes
|
description: A Helm chart for Kubernetes
|
||||||
name: argo
|
name: argo
|
||||||
version: 0.2.0
|
version: 0.2.1
|
||||||
|
|
|
@ -9,4 +9,4 @@ roleRef:
|
||||||
subjects:
|
subjects:
|
||||||
- kind: ServiceAccount
|
- kind: ServiceAccount
|
||||||
name: {{ .Values.ui.serviceAccount }}
|
name: {{ .Values.ui.serviceAccount }}
|
||||||
namespace: {{ .Release.Name }}
|
namespace: {{ .Release.Namespace }}
|
||||||
|
|
31
charts/argo/templates/ui-ingress.yaml
Normal file
31
charts/argo/templates/ui-ingress.yaml
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
{{- if .Values.ui.ingress.enabled -}}
|
||||||
|
{{- $serviceName := printf "%s-%s" .Release.Name .Values.ui.name -}}
|
||||||
|
{{- $servicePort := .Values.ui.servicePort -}}
|
||||||
|
apiVersion: extensions/v1beta1
|
||||||
|
kind: Ingress
|
||||||
|
metadata:
|
||||||
|
name: {{ .Release.Name }}-{{ .Values.ui.name }}
|
||||||
|
labels:
|
||||||
|
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||||
|
release: {{ .Release.Name }}
|
||||||
|
heritage: {{ .Release.Service }}
|
||||||
|
namspace: {{ .Release.Namespace }}
|
||||||
|
annotations:
|
||||||
|
{{- range $key, $value := .Values.ui.ingress.annotations }}
|
||||||
|
{{ $key }}: {{ $value | quote }}
|
||||||
|
{{- end }}
|
||||||
|
spec:
|
||||||
|
rules:
|
||||||
|
{{- range .Values.ui.ingress.hosts }}
|
||||||
|
- host: {{ . }}
|
||||||
|
http:
|
||||||
|
paths:
|
||||||
|
- backend:
|
||||||
|
serviceName: {{ $serviceName }}
|
||||||
|
servicePort: {{ $servicePort }}
|
||||||
|
{{- end -}}
|
||||||
|
{{- if .Values.ui.ingress.tls }}
|
||||||
|
tls:
|
||||||
|
{{ toYaml .Values.ui.ingress.tls | indent 4 }}
|
||||||
|
{{- end -}}
|
||||||
|
{{- end -}}
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Service
|
kind: Service
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Name }}-{{ .Values.ui.name}}
|
name: {{ .Release.Name }}-{{ .Values.ui.name }}
|
||||||
labels:
|
labels:
|
||||||
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
|
||||||
release: {{ .Release.Name }}
|
release: {{ .Release.Name }}
|
||||||
|
@ -12,7 +12,7 @@ metadata:
|
||||||
{{ toYaml .Values.ui.serviceAnnotations | indent 4}}{{- end }}
|
{{ toYaml .Values.ui.serviceAnnotations | indent 4}}{{- end }}
|
||||||
spec:
|
spec:
|
||||||
ports:
|
ports:
|
||||||
- port: 80
|
- port: {{ .Values.ui.servicePort }}
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
targetPort: 8001
|
targetPort: 8001
|
||||||
selector:
|
selector:
|
||||||
|
|
|
@ -37,10 +37,37 @@ ui:
|
||||||
name: ui
|
name: ui
|
||||||
# Enables ability to SSH into pod using web UI
|
# Enables ability to SSH into pod using web UI
|
||||||
enableWebConsole: false
|
enableWebConsole: false
|
||||||
serviceType: LoadBalancer
|
serviceType: ClusterIP
|
||||||
|
servicePort: 80
|
||||||
serviceAccount: argo-ui
|
serviceAccount: argo-ui
|
||||||
# Annotations to be applied to the UI Service
|
# Annotations to be applied to the UI Service
|
||||||
serviceAnnotations: {}
|
serviceAnnotations: {}
|
||||||
|
|
||||||
|
## Ingress configuration.
|
||||||
|
## ref: https://kubernetes.io/docs/user-guide/ingress/
|
||||||
|
##
|
||||||
|
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
|
||||||
|
|
||||||
# Influences the creation of the ConfigMap for the workflow-controller itself.
|
# Influences the creation of the ConfigMap for the workflow-controller itself.
|
||||||
useDefaultArtifactRepo: false
|
useDefaultArtifactRepo: false
|
||||||
|
|
Loading…
Reference in a new issue