Merge pull request #847 from 3dwardch3ng/infra/metallb

unused ingress code clean up

apps/adguard-home/env/k3s-cluster/ingress.yaml

@@ -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

apps/adguard-home/env/k3s-cluster/kustomization.yaml

@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../../base
-#  - ./ingress.yaml

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

apps/jellyfin/env/k3s-cluster/ingress.yaml

@@ -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

apps/jellyfin/env/k3s-cluster/kustomization.yaml

@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../../base
-#  - ./ingress.yaml

apps/snippet-box/base/ingress.yaml

@@ -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

apps/snippet-box/base/kustomization.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./deployment.yaml
-  - ./service.yaml
+  - ./service.yaml
-  - ./ingress.yaml

apps/uptime-kuma/env/k3s-cluster/ingress.yaml

@@ -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

apps/uptime-kuma/env/k3s-cluster/kustomization.yaml

@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../../base
-#  - ./ingress.yaml

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

infrastructures/redis-insight/env/k3s-cluster/ingress.yaml

@@ -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

infrastructures/redis-insight/env/k3s-cluster/kustomization.yaml

@@ -1,5 +1,4 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ../../base
+  - ../../base
-#  - ./ingress.yaml