From 755d401631c6e60b55a7c0abfda54b2dc8c913d5 Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Wed, 12 Jun 2024 10:57:21 +1000
Subject: [PATCH] fix patches

---
 .../config/ingress-configmap.yaml             |  2 +-
 .../ingress-nginx/ingress-nginx.yaml          | 36 +++++--------------
 .../templates/apps/ingress-nginx/release.yaml |  4 ---
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/kubernetes/infrastructure/ingress-nginx/config/ingress-configmap.yaml b/kubernetes/infrastructure/ingress-nginx/config/ingress-configmap.yaml
index d4c1da4..a89a378 100644
--- a/kubernetes/infrastructure/ingress-nginx/config/ingress-configmap.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/config/ingress-configmap.yaml
@@ -8,7 +8,7 @@ data:
   "853": "adguard-home/adguard-home:853"
   "5443": "adguard-home/adguard-home:5443"
   "6060": "adguard-home/adguard-home:6060"
-  "9000": "flux-system/capacitor:9000"
+  "9099": "flux-system/capacitor:9000"
   "10080": "adguard-home/adguard-home:80"
   "10443": "adguard-home/adguard-home:443"
   "13000": "adguard-home/adguard-home::3000"
diff --git a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
index e8c8ca5..149049b 100644
--- a/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
+++ b/kubernetes/infrastructure/ingress-nginx/ingress-nginx.yaml
@@ -20,34 +20,14 @@ spec:
         name: ingress-nginx-values
   patches:
     - target:
-        kind: HelmRelease
-        name: ingress-nginx
+        kind: Service
+        name: ingress-nginx-controller
+        namespace: ingress-nginx
       patch: |
         - op: add
-          path: /spec/postRenderers/0//kustomize/patches/-
+          path: /spec/ports/-
           value:
-            target:
-              kind: Service
-              name: ingress-nginx-controller
-            patch: |
-              - op: add
-                path: "/spec/ports/-"
-                value:
-                  name: capacitor-tcp-9000
-                  nodePort: 31555
-                  port: 9000
-                  protocol: TCP
-                  targetPort: 9000
-        - op: add
-          path: /spec/postRenderers/0/kustomize/patches/-
-          value:
-            target:
-              kind: Deployment
-              name: ingress-nginx-controller
-            patch: |
-              - op: add
-                path: "/spec/template/spec/containers/0/ports/-"
-                value:
-                  containerPort: 9000
-                  name: capacitor
-                  protocol: TCP
+            name: proxied-tcp-9099
+            port: 9099
+            targetPort: 9099
+            protocol: TCP
diff --git a/kubernetes/templates/apps/ingress-nginx/release.yaml b/kubernetes/templates/apps/ingress-nginx/release.yaml
index 7379e12..63f5e04 100644
--- a/kubernetes/templates/apps/ingress-nginx/release.yaml
+++ b/kubernetes/templates/apps/ingress-nginx/release.yaml
@@ -97,7 +97,3 @@ spec:
           value: "8192"
       podLabels:
         rpi5.cluster.policy/ingress-namespace: "true"
-
-  postRenderers:
-    - kustomize:
-        patches: []