DevFW-CICD/argocd-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ingress-aws): Fix path order in AWS Ingress declaration

Browse source 
Fix path order to evaluate GRPc endpoint first

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
This commit is contained in:
fulcrum29 2024-02-20 11:34:56 +01:00 committed by GitHub
parent aa69a77691
commit e45eea852f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
charts/argo-cd/templates/argocd-server/aws/ingress.yaml
View file

@ -28,13 +28,6 @@ spec:
{{- with .Values.server.ingress.extraPaths }} {{- with .Values.server.ingress.extraPaths }}
{{- toYaml . | nindent 10 }} {{- toYaml . | nindent 10 }}
{{- end }} {{- end }}
- path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingress.pathType }}
backend:
service:
name: {{ include "argo-cd.server.fullname" . }}
port:
number: {{ $servicePort }}
- path: {{ .Values.server.ingress.path }} - path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingressGrpc.pathType }} pathType: {{ $.Values.server.ingressGrpc.pathType }}
backend: backend:
@ -42,6 +35,13 @@ spec:
name: {{ include "argo-cd.server.fullname" $ }}-grpc name: {{ include "argo-cd.server.fullname" $ }}-grpc
port: port:
number: {{ $servicePort }} number: {{ $servicePort }}
- path: {{ .Values.server.ingress.path }}
pathType: {{ $.Values.server.ingress.pathType }}
backend:
service:
name: {{ include "argo-cd.server.fullname" . }}
port:
number: {{ $servicePort }}
{{- range .Values.server.ingress.extraHosts }} {{- range .Values.server.ingress.extraHosts }}
- host: {{ .name | quote }} - host: {{ .name | quote }}
http: http: