From 3e655fb598cfeecf24d0db9f68d2b6e88c77f534 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 30 Jan 2024 03:32:44 +0100
Subject: [PATCH] feat(longhorn): Move to new kustomize-optimised config

---
 clusters/k8s01/longhorn/ingress.yaml       | 5 -----
 clusters/k8s01/longhorn/kustomization.yaml | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/clusters/k8s01/longhorn/ingress.yaml b/clusters/k8s01/longhorn/ingress.yaml
index 247306a68..665855bba 100644
--- a/clusters/k8s01/longhorn/ingress.yaml
+++ b/clusters/k8s01/longhorn/ingress.yaml
@@ -8,11 +8,6 @@ metadata:
         forecastle.stakater.com/appName: Longhorn
         forecastle.stakater.com/group: Management
         forecastle.stakater.com/icon: https://content-proxy.shivering-isles.com/8839ef829401563ce0729005e7c30224918e2271/68747470733a2f2f617661746172732e67697468756275736572636f6e74656e742e636f6d2f752f3531333335333636
-        forecastle.stakater.com/network-restricted: "true"
-        nginx.ingress.kubernetes.io/auth-response-headers: Authorization
-        nginx.ingress.kubernetes.io/auth-url: https://$host/oauth2/auth
-        nginx.ingress.kubernetes.io/auth-signin: https://$host/oauth2/start?rd=$escaped_request_uri
-        nginx.ingress.kubernetes.io/whitelist-source-range: 10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,100.64.0.0/24
 spec:
     rules:
         - host: ENC[AES256_GCM,data:eBQRvj0E4eODWDYTXe+1iu3p+koCwHhVcxw=,iv:DR0LwShFLl9pS13VgTuCuag8qo3uKug26g9eV2AAkLE=,tag:c7MwWxEsVuV0EvckG+nKqQ==,type:str]
diff --git a/clusters/k8s01/longhorn/kustomization.yaml b/clusters/k8s01/longhorn/kustomization.yaml
index cdee40596..da48e6f38 100644
--- a/clusters/k8s01/longhorn/kustomization.yaml
+++ b/clusters/k8s01/longhorn/kustomization.yaml
@@ -4,6 +4,9 @@ namespace: longhorn-system
 resources:
 - backup.yaml
 - certificate.yaml
-- ../../../shared/applications/oauth2-proxy.yaml
 - oauth2.yaml
 - ingress.yaml
+
+components:
+  - ../../../shared/components/oauth2-proxy
+  - ../../../shared/components/ingress-local-only
\ No newline at end of file
-- 
GitLab