From cddaf999d1b1aa4f4d291dd3b7092e5817de7a2d Mon Sep 17 00:00:00 2001
From: David Landry <david@dmwl.net>
Date: Wed, 8 May 2024 00:04:23 -0400
Subject: [PATCH] fix(bootstrap): need to split into two ingress resources for
 nginx controller

---
 bootstrap/argo-cd/ingress-grpc.yaml           | 30 +++++++++++++++++++
 .../{ingress.yaml => ingress-html.yaml}       |  4 ++-
 bootstrap/argo-cd/kustomization.yaml          |  3 +-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 bootstrap/argo-cd/ingress-grpc.yaml
 rename bootstrap/argo-cd/{ingress.yaml => ingress-html.yaml} (89%)

diff --git a/bootstrap/argo-cd/ingress-grpc.yaml b/bootstrap/argo-cd/ingress-grpc.yaml
new file mode 100644
index 0000000..c3c4e42
--- /dev/null
+++ b/bootstrap/argo-cd/ingress-grpc.yaml
@@ -0,0 +1,30 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-issuer
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
+    nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
+    # gethomepage.dev/enabled: "true"
+    # gethomepage.dev/name: "ArgoCD"
+    # gethomepage.dev/description: "Manage k8s applications"
+    # gethomepage.dev/group: "System"
+  name: argocd-server-grpc
+  namespace: argocd
+spec:
+  ingressClassName: nginx
+  rules:
+    - host: grpc.argocd.int.nc.landry.land
+      http:
+        paths:
+          - path: /
+            backend:
+              service:
+                name: argogrpc
+                port:
+                  number: 443
+            pathType: Prefix
+  tls:
+    - hosts:
+        - grpc.argocd.int.nc.landry.land
+      secretName: argocd-grpc-tls
diff --git a/bootstrap/argo-cd/ingress.yaml b/bootstrap/argo-cd/ingress-html.yaml
similarity index 89%
rename from bootstrap/argo-cd/ingress.yaml
rename to bootstrap/argo-cd/ingress-html.yaml
index 8fb6311..0a08296 100644
--- a/bootstrap/argo-cd/ingress.yaml
+++ b/bootstrap/argo-cd/ingress-html.yaml
@@ -3,13 +3,15 @@ kind: Ingress
 metadata:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-issuer
+    nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     # gethomepage.dev/enabled: "true"
     # gethomepage.dev/name: "ArgoCD"
     # gethomepage.dev/description: "Manage k8s applications"
     # gethomepage.dev/group: "System"
-  name: argocd
+  name: argocd-server
   namespace: argocd
 spec:
+  ingressClassName: nginx
   rules:
     - host: argocd.int.nc.landry.land
       http:
diff --git a/bootstrap/argo-cd/kustomization.yaml b/bootstrap/argo-cd/kustomization.yaml
index f7b5003..7795317 100644
--- a/bootstrap/argo-cd/kustomization.yaml
+++ b/bootstrap/argo-cd/kustomization.yaml
@@ -18,5 +18,6 @@ configMapGenerator:
 
 resources:
   - github.com/argoproj-labs/argocd-autopilot/manifests/base?ref=v0.4.17
-  - ./ingress.yaml
   - ./argogrpc.service.yaml
+  - ./ingress-html.yaml
+  - ./ingress-grpc.yaml