From d2be6e6cc94b9d2d85a519045bfe1a29facf84f6 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Sat, 7 Sep 2024 22:41:10 -0400
Subject: [PATCH] fix: use correct path of thin cluster traefik

---
 kubernetes/thin/apps/main-ip-pool.yaml        |  8 -------
 .../traefik/app/files/dashboard-ingress.yaml  | 24 -------------------
 .../apps/traefik/app/files/helm-release.yaml  | 13 +++++-----
 .../apps/traefik/app/files/internal-hr.yaml   |  8 +++----
 .../apps/traefik/app/files/kustomization.yaml |  3 +--
 kubernetes/thin/apps/traefik/app/ks.yaml      |  2 +-
 6 files changed, 12 insertions(+), 46 deletions(-)
 delete mode 100644 kubernetes/thin/apps/main-ip-pool.yaml
 delete mode 100644 kubernetes/thin/apps/traefik/app/files/dashboard-ingress.yaml

diff --git a/kubernetes/thin/apps/main-ip-pool.yaml b/kubernetes/thin/apps/main-ip-pool.yaml
deleted file mode 100644
index bccf201..0000000
--- a/kubernetes/thin/apps/main-ip-pool.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: "cilium.io/v2alpha1"
-kind: CiliumLoadBalancerIPPool
-metadata:
-  name: "main-pool"
-spec:
-  blocks:
-  - start: "192.168.1.50"
-    stop: "192.168.1.59"
\ No newline at end of file
diff --git a/kubernetes/thin/apps/traefik/app/files/dashboard-ingress.yaml b/kubernetes/thin/apps/traefik/app/files/dashboard-ingress.yaml
deleted file mode 100644
index 965ae98..0000000
--- a/kubernetes/thin/apps/traefik/app/files/dashboard-ingress.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: traefik-dash-ingress
-  namespace: traefik
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.middlewares: traefik-authentik@kubernetescrd
-spec:
-  rules:
-    - host: "traefik.${SECRET_DOMAIN}"
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: traefik
-                port:
-                  number: 9000
-  tls:
-    - hosts:
-      - "${SECRET_DOMAIN}"
-      - "traefik.${SECRET_DOMAIN}"
\ No newline at end of file
diff --git a/kubernetes/thin/apps/traefik/app/files/helm-release.yaml b/kubernetes/thin/apps/traefik/app/files/helm-release.yaml
index 5a93165..755e906 100644
--- a/kubernetes/thin/apps/traefik/app/files/helm-release.yaml
+++ b/kubernetes/thin/apps/traefik/app/files/helm-release.yaml
@@ -75,18 +75,17 @@ spec:
       dashboard:
         enabled: false
 
-    # Set Traefik as your default Ingress Controller, according to Kubernetes 1.19+ changes.
     ingressClass:
       enabled: true
-      isDefaultClass: true
-      name: traefik-external
+      isDefaultClass: false
+      name: external
 
     metrics:
       prometheus:
         entryPoint: metrics
 
     # Set default certificate
-    tlsStore:
-      default:
-        defaultCertificate:
-          secretName: wildcard-main-tls
+#    tlsStore:
+#      default:
+#        defaultCertificate:
+#          secretName: wildcard-main-tls
diff --git a/kubernetes/thin/apps/traefik/app/files/internal-hr.yaml b/kubernetes/thin/apps/traefik/app/files/internal-hr.yaml
index c270de5..3c9b7cc 100644
--- a/kubernetes/thin/apps/traefik/app/files/internal-hr.yaml
+++ b/kubernetes/thin/apps/traefik/app/files/internal-hr.yaml
@@ -38,7 +38,7 @@ spec:
     ports:
       web:
         port: 8000
-        nodePort: 30080
+        nodePort: 30081
         expose:
           default: true
         redirectTo:
@@ -47,7 +47,7 @@ spec:
 
       websecure:
         port: 8443
-        nodePort: 30443
+        nodePort: 30444
         expose:
           default: true
         protocol: TCP
@@ -67,8 +67,8 @@ spec:
 
     ingressClass:
       enabled: true
-      isDefaultClass: false
-      name: traefik-internal
+      isDefaultClass: true
+      name: internal
 
     metrics:
       prometheus:
diff --git a/kubernetes/thin/apps/traefik/app/files/kustomization.yaml b/kubernetes/thin/apps/traefik/app/files/kustomization.yaml
index 529ab34..8f65359 100644
--- a/kubernetes/thin/apps/traefik/app/files/kustomization.yaml
+++ b/kubernetes/thin/apps/traefik/app/files/kustomization.yaml
@@ -4,5 +4,4 @@ resources:
 - ./namespace.yaml
 - ./helm-repository.yaml
 - ./helm-release.yaml
-- ./internal-hr.yaml
-- ./dashboard-ingress.yaml
\ No newline at end of file
+- ./internal-hr.yaml
\ No newline at end of file
diff --git a/kubernetes/thin/apps/traefik/app/ks.yaml b/kubernetes/thin/apps/traefik/app/ks.yaml
index d514965..39f2a0d 100644
--- a/kubernetes/thin/apps/traefik/app/ks.yaml
+++ b/kubernetes/thin/apps/traefik/app/ks.yaml
@@ -7,7 +7,7 @@ metadata:
 spec:
   timeout: 5m
   interval: 10m
-  path: ./kubernetes/common/apps/traefik/app/files
+  path: ./kubernetes/thin/apps/traefik/app/files
   prune: true
   sourceRef:
     kind: GitRepository