From f198eecc231b2decad86c41773412f4185755879 Mon Sep 17 00:00:00 2001
From: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
Date: Tue, 20 Feb 2024 12:38:50 +0100
Subject: [PATCH] fix(argo-cd): Fix path order in AWS Ingress declaration
 (#2531)

* 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>

* chore: update Chart version

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>

* chore: add aritfacthub description

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>

---------

Signed-off-by: fulcrum29 <35672150+fulcrum29@users.noreply.github.com>
---
 charts/argo-cd/Chart.yaml                          |  4 ++--
 .../templates/argocd-server/aws/ingress.yaml       | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index a6c03d2f..0ca54554 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.10.1
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.2.1
+version: 6.2.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: fixed
-      description: Add missing `global.domain` default values
+      description: AWS gRPC Ingress rule ordering
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: