From 4353d8d4d69e95a59df05783d4a0fe1308e69fd9 Mon Sep 17 00:00:00 2001
From: Jacek Domagalski <jacek.domagalski@cdq.com>
Date: Tue, 21 Feb 2023 10:59:47 +0100
Subject: [PATCH] feat(argo-cd): added ability to install server ingress in
 different namespace than Release

Signed-off-by: Jacek Domagalski <domagalski.j@gmail.com>
---
 charts/argo-cd/Chart.yaml                           | 6 +++---
 charts/argo-cd/README.md                            | 1 +
 charts/argo-cd/templates/argocd-server/ingress.yaml | 1 +
 charts/argo-cd/values.yaml                          | 2 ++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index efd96096..84ecec18 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.6.2
 kubeVersion: ">=1.22.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 5.22.1
+version: 5.23.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -23,5 +23,5 @@ dependencies:
     condition: redis-ha.enabled
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: Grouped component templates together
+    - kind: added
+      description: ability to install argo-cd server ingress in different namespace than Release
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 2533c180..1b8c1def 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -682,6 +682,7 @@ NAME: my-release
 | server.ingress.https | bool | `false` | Uses `server.service.servicePortHttps` instead `server.service.servicePortHttp` |
 | server.ingress.ingressClassName | string | `""` | Defines which ingress controller will implement the resource |
 | server.ingress.labels | object | `{}` | Additional ingress labels |
+| server.ingress.namespace | string | `""` | Install ingress in the different namespace than Release  |
 | server.ingress.pathType | string | `"Prefix"` | Ingress path type. One of `Exact`, `Prefix` or `ImplementationSpecific` |
 | server.ingress.paths | list | `["/"]` | List of ingress paths |
 | server.ingress.tls | list | `[]` | Ingress TLS configuration |
diff --git a/charts/argo-cd/templates/argocd-server/ingress.yaml b/charts/argo-cd/templates/argocd-server/ingress.yaml
index 0e064b0b..32c14fb3 100644
--- a/charts/argo-cd/templates/argocd-server/ingress.yaml
+++ b/charts/argo-cd/templates/argocd-server/ingress.yaml
@@ -7,6 +7,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ include "argo-cd.server.fullname" . }}
+  namespace: {{ .Values.server.ingress.namespace | default .Release.Namespace }}
   labels:
     {{- include "argo-cd.labels" (dict "context" . "component" .Values.server.name "name" .Values.server.name) | nindent 4 }}
     {{- with .Values.server.ingress.labels }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index b3706c5a..42cde0d9 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -1693,6 +1693,8 @@ server:
   ingress:
     # -- Enable an ingress resource for the Argo CD server
     enabled: false
+    # -- Install ingress in the different namespace than Release 
+    namespace: ""
     # -- Additional ingress annotations
     annotations: {}
     # -- Additional ingress labels