From e45eea852fba63ae79223b0b5de2ed94ed9bd8a2 Mon Sep 17 00:00:00 2001
From: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:34:56 +0100
Subject: [PATCH] fix(ingress-aws): Fix path order in AWS Ingress declaration

Fix path order to evaluate GRPc endpoint first

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
---
 .../templates/argocd-server/aws/ingress.yaml       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-server/aws/ingress.yaml b/charts/argo-cd/templates/argocd-server/aws/ingress.yaml
index b44d1739..2238acbc 100644
--- a/charts/argo-cd/templates/argocd-server/aws/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/aws/ingress.yaml
@@ -28,13 +28,6 @@ spec:
           {{- with .Values.server.ingress.extraPaths }}
             {{- toYaml . | nindent 10 }}
           {{- 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 }}
             pathType: {{ $.Values.server.ingressGrpc.pathType }}
             backend:
@@ -42,6 +35,13 @@ spec:
                 name: {{ include "argo-cd.server.fullname" $ }}-grpc
                 port:
                   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 }}
     - host: {{ .name | quote }}
       http: