Added conditionals for ingressGrpc extraPaths
This commit is contained in:
parent
8531e2523f
commit
b0235aec0c
1 changed files with 8 additions and 3 deletions
|
@ -2,6 +2,7 @@
|
||||||
{{- $serviceName := include "argo-cd.server.fullname" . -}}
|
{{- $serviceName := include "argo-cd.server.fullname" . -}}
|
||||||
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
|
{{- $servicePort := ternary .Values.server.service.servicePortHttps .Values.server.service.servicePortHttp .Values.server.ingressGrpc.https -}}
|
||||||
{{- $paths := .Values.server.ingressGrpc.paths -}}
|
{{- $paths := .Values.server.ingressGrpc.paths -}}
|
||||||
|
{{- $extraPaths := .Values.server.ingressGrpc.extraPaths -}}
|
||||||
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
|
{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }}
|
||||||
apiVersion: networking.k8s.io/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
{{ else }}
|
{{ else }}
|
||||||
|
@ -33,7 +34,9 @@ spec:
|
||||||
- host: {{ $host }}
|
- host: {{ $host }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
{{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
|
{{- if $extraPaths }}
|
||||||
|
{{- toYaml $extraPaths | nindent 10 }}
|
||||||
|
{{- end -}}
|
||||||
{{- range $p := $paths }}
|
{{- range $p := $paths }}
|
||||||
- path: {{ $p }}
|
- path: {{ $p }}
|
||||||
backend:
|
backend:
|
||||||
|
@ -44,7 +47,9 @@ spec:
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- http:
|
- http:
|
||||||
paths:
|
paths:
|
||||||
{{- toYaml .Values.server.ingressGrpc.extraPaths | nindent 10 }}
|
{{- if $extraPaths }}
|
||||||
|
{{- toYaml $extraPaths | nindent 10 }}
|
||||||
|
{{- end -}}
|
||||||
{{- range $p := $paths }}
|
{{- range $p := $paths }}
|
||||||
- path: {{ $p }}
|
- path: {{ $p }}
|
||||||
backend:
|
backend:
|
||||||
|
@ -56,4 +61,4 @@ spec:
|
||||||
tls:
|
tls:
|
||||||
{{- toYaml .Values.server.ingressGrpc.tls | nindent 4 }}
|
{{- toYaml .Values.server.ingressGrpc.tls | nindent 4 }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
Loading…
Reference in a new issue