From 5bf65cdf2ba4c6c6ac0f2a03c073cf04a6ebf2ff Mon Sep 17 00:00:00 2001
From: Edward Cheng <edward@cheng.sydney>
Date: Mon, 26 Aug 2024 19:51:22 +1000
Subject: [PATCH] unused ingress code clean up

---
 .../adguard-home/env/k3s-cluster/ingress.yaml | 61 -------------------
 .../env/k3s-cluster/kustomization.yaml        |  3 +-
 apps/jellyfin/base/values.yaml                |  5 ++
 apps/jellyfin/env/k3s-cluster/ingress.yaml    | 31 ----------
 .../env/k3s-cluster/kustomization.yaml        |  3 +-
 apps/snippet-box/base/ingress.yaml            | 21 -------
 apps/snippet-box/base/kustomization.yaml      |  3 +-
 apps/uptime-kuma/env/k3s-cluster/ingress.yaml | 21 -------
 .../env/k3s-cluster/kustomization.yaml        |  3 +-
 .../redis-insight/base/service.yaml           |  5 +-
 .../env/k3s-cluster/ingress.yaml              | 21 -------
 .../env/k3s-cluster/kustomization.yaml        |  3 +-
 12 files changed, 14 insertions(+), 166 deletions(-)
 delete mode 100644 apps/adguard-home/env/k3s-cluster/ingress.yaml
 delete mode 100644 apps/jellyfin/env/k3s-cluster/ingress.yaml
 delete mode 100644 apps/snippet-box/base/ingress.yaml
 delete mode 100644 apps/uptime-kuma/env/k3s-cluster/ingress.yaml
 delete mode 100644 infrastructures/redis-insight/env/k3s-cluster/ingress.yaml

diff --git a/apps/adguard-home/env/k3s-cluster/ingress.yaml b/apps/adguard-home/env/k3s-cluster/ingress.yaml
deleted file mode 100644
index 8478636..0000000
--- a/apps/adguard-home/env/k3s-cluster/ingress.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: adguard-home-ingress
-#  namespace: adguard-home
-#  annotations:
-#    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-#    nginx.ingress.kubernetes.io/use-regex: "true"
-#spec:
-#  ingressClassName: nginx
-#  rules:
-#    - host: "adguard-home.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: adguard-home
-#                port:
-#                  number: 10080
-#    - host: "adguard-home.cluster.local"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: adguard-home
-#                port:
-#                  number: 10080
-#    - host: "setup.adguard-home.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: adguard-home
-#                port:
-#                  number: 13000
-#    - host: "setup.adguard-home.cluster.local"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: adguard-home
-#                port:
-#                  number: 13000
-#    - host: "doh.adguard-home.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: adguard-home
-#                port:
-#                  number: 443
diff --git a/apps/adguard-home/env/k3s-cluster/kustomization.yaml b/apps/adguard-home/env/k3s-cluster/kustomization.yaml
index ef7a630..a227ac4 100644
--- a/apps/adguard-home/env/k3s-cluster/kustomization.yaml
+++ b/apps/adguard-home/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-#  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/apps/jellyfin/base/values.yaml b/apps/jellyfin/base/values.yaml
index f10c367..b3fa711 100644
--- a/apps/jellyfin/base/values.yaml
+++ b/apps/jellyfin/base/values.yaml
@@ -20,6 +20,11 @@ persistence:
         - ReadWriteOnce
       volumeName: jellyfin-data
       storageClassName: local-path
+service:
+  type: LoadBalancer
+  annotations:
+    metallb.universe.tf/address-pool: k3s-cluster-ip-pool
+    metallb.universe.tf/allow-shared-ip: k3s-cluster
 jellyfin:
   mediaVolumes:
     - name: movies
diff --git a/apps/jellyfin/env/k3s-cluster/ingress.yaml b/apps/jellyfin/env/k3s-cluster/ingress.yaml
deleted file mode 100644
index eb5b227..0000000
--- a/apps/jellyfin/env/k3s-cluster/ingress.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: jellyfin-ingress
-#  namespace: jellyfin
-#  annotations:
-#    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-#    nginx.ingress.kubernetes.io/use-regex: "true"
-#spec:
-#  ingressClassName: nginx
-#  rules:
-#    - host: "jellyfin.cluster.local"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: jellyfin
-#                port:
-#                  number: 8096
-#    - host: "jellyfin.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: jellyfin
-#                port:
-#                  number: 8096
\ No newline at end of file
diff --git a/apps/jellyfin/env/k3s-cluster/kustomization.yaml b/apps/jellyfin/env/k3s-cluster/kustomization.yaml
index ef7a630..a227ac4 100644
--- a/apps/jellyfin/env/k3s-cluster/kustomization.yaml
+++ b/apps/jellyfin/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-#  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/apps/snippet-box/base/ingress.yaml b/apps/snippet-box/base/ingress.yaml
deleted file mode 100644
index 453dedf..0000000
--- a/apps/snippet-box/base/ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: snippet-box-ingress
-#  namespace: snippet-box
-#  annotations:
-#    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-#    nginx.ingress.kubernetes.io/use-regex: "true"
-#spec:
-#  ingressClassName: nginx
-#  rules:
-#    - host: "snippet-box.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: snippet-box
-#                port:
-#                  number: 5000
\ No newline at end of file
diff --git a/apps/snippet-box/base/kustomization.yaml b/apps/snippet-box/base/kustomization.yaml
index 1ad0930..87b09a3 100644
--- a/apps/snippet-box/base/kustomization.yaml
+++ b/apps/snippet-box/base/kustomization.yaml
@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./deployment.yaml
-  - ./service.yaml
-  - ./ingress.yaml
\ No newline at end of file
+  - ./service.yaml
\ No newline at end of file
diff --git a/apps/uptime-kuma/env/k3s-cluster/ingress.yaml b/apps/uptime-kuma/env/k3s-cluster/ingress.yaml
deleted file mode 100644
index 64ec135..0000000
--- a/apps/uptime-kuma/env/k3s-cluster/ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: uptime-kuma-ingress
-#  namespace: uptime-kuma
-#  annotations:
-#    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-#    nginx.ingress.kubernetes.io/use-regex: "true"
-#spec:
-#  ingressClassName: nginx
-#  rules:
-#    - host: "uptime-kuma.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: uptime-kuma
-#                port:
-#                  number: 3001
\ No newline at end of file
diff --git a/apps/uptime-kuma/env/k3s-cluster/kustomization.yaml b/apps/uptime-kuma/env/k3s-cluster/kustomization.yaml
index ef7a630..a227ac4 100644
--- a/apps/uptime-kuma/env/k3s-cluster/kustomization.yaml
+++ b/apps/uptime-kuma/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-#  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file
diff --git a/infrastructures/redis-insight/base/service.yaml b/infrastructures/redis-insight/base/service.yaml
index dac4bbc..5d51a4d 100644
--- a/infrastructures/redis-insight/base/service.yaml
+++ b/infrastructures/redis-insight/base/service.yaml
@@ -3,10 +3,13 @@ kind: Service
 metadata:
   name: redis-insight
   namespace: redis
+  annotations:
+    metallb.universe.tf/address-pool: k3s-cluster-ip-pool
+    metallb.universe.tf/allow-shared-ip: k3s-cluster
   labels:
     app.kubernetes.io/name: redis-insight
 spec:
-  type: ClusterIP
+  type: LoadBalancer
   ports:
     - port: 5540
       targetPort: 5540
diff --git a/infrastructures/redis-insight/env/k3s-cluster/ingress.yaml b/infrastructures/redis-insight/env/k3s-cluster/ingress.yaml
deleted file mode 100644
index 5d2ca97..0000000
--- a/infrastructures/redis-insight/env/k3s-cluster/ingress.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-#apiVersion: networking.k8s.io/v1
-#kind: Ingress
-#metadata:
-#  name: redis-insight-ingress
-#  namespace: redis
-#  annotations:
-#    nginx.ingress.kubernetes.io/ssl-redirect: "false"
-#    nginx.ingress.kubernetes.io/use-regex: "true"
-#spec:
-#  ingressClassName: nginx
-#  rules:
-#    - host: "redis-insight.cluster.edward.sydney"
-#      http:
-#        paths:
-#          - pathType: Prefix
-#            path: "/"
-#            backend:
-#              service:
-#                name: redis-insight
-#                port:
-#                  number: 5540
\ No newline at end of file
diff --git a/infrastructures/redis-insight/env/k3s-cluster/kustomization.yaml b/infrastructures/redis-insight/env/k3s-cluster/kustomization.yaml
index ef7a630..a227ac4 100644
--- a/infrastructures/redis-insight/env/k3s-cluster/kustomization.yaml
+++ b/infrastructures/redis-insight/env/k3s-cluster/kustomization.yaml
@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
-#  - ./ingress.yaml
\ No newline at end of file
+  - ../../base
\ No newline at end of file