From a1763cd80dbd3d81bc87552a519620a654b852e0 Mon Sep 17 00:00:00 2001
From: CJ_Clippy <cj@futureporn.net>
Date: Thu, 25 Apr 2024 16:49:21 +0000
Subject: [PATCH] use my own ingress for wmill

---
 charts/fp/templates/link2cid.yaml |  2 +-
 charts/fp/templates/windmill.yaml | 57 +++++++++++++++++++------------
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/charts/fp/templates/link2cid.yaml b/charts/fp/templates/link2cid.yaml
index f756841..63d744f 100644
--- a/charts/fp/templates/link2cid.yaml
+++ b/charts/fp/templates/link2cid.yaml
@@ -101,6 +101,6 @@ spec:
             name: link2cid
             port:
               number: 80
----
+
 
 {{ end }}
diff --git a/charts/fp/templates/windmill.yaml b/charts/fp/templates/windmill.yaml
index 22d2b3d..1a7b4ef 100644
--- a/charts/fp/templates/windmill.yaml
+++ b/charts/fp/templates/windmill.yaml
@@ -12,8 +12,8 @@ spec:
   project: default
   source:
     path: windmill/windmill
-    repoURL: https://windmill-labs.github.io/windmill-helm-charts
-    targetRevision: f20a4a626dbd18e5d3b0c9439af8ec7f90d269d7
+    repoURL: https://windmill-labs.github.io/windmill-helm-charts.git
+    targetRevision: HEAD
     helm:
       valuesObject:
         # windmill root values block
@@ -84,25 +84,38 @@ spec:
           # enable minio (bitnami) on kubernetes
           minio:
             enabled: false
-          # Configure Ingress
           ingress:
-            className: "nginx"
-          # enable enterprise features
-          enterprise:
-            # -- enable windmill enterprise, requires license key.
             enabled: false
-            enterprise:
-              enable: false
-              ingress:
-                enabled: true
-                path: /
-                hosts:
-                  - windmill2.sbtp.xyz
-                annotations:
-                  kubernetes.io/ingress.class: nginx
-                  kubernetes.io/tls-acme: "true"
-                labels: {}
-                tls:
-                  - secretName: windmill-tls
-                    hosts:
-                      - windmill2.sbtp.xyz
+          enterprise:
+            enable: false
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: windmill-ingress
+  namespace: default
+  annotations:
+    kubernetes.io/ingress.class: "nginx"
+    nginx.ingress.kubernetes.io/ssl-redirect: "true"
+    cert-manager.io/cluster-issuer: "letsencrypt-staging"
+spec:
+  ingressClassName: nginx
+  secretTemplate:
+    annotations:
+      reflector.v1.k8s.emberstack.com/reflection-allowed: "true"
+      reflector.v1.k8s.emberstack.com/reflection-allowed-namespaces: ""
+  tls:
+  - hosts:
+    - windmill2.sbtp.xyz
+    secretName: windmill-tls
+  rules:
+  - host: windmill2.sbtp.xyz
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: windmill
+            port:
+              number: 80
\ No newline at end of file