From f8e417a8bbdb52d7c6b6375823e59cfffd730129 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 26 Aug 2024 22:59:42 +1000 Subject: [PATCH] add ingress for services jellyfin, kavita nexus --- apps/jellyfin/base/values.yaml | 5 ----- apps/jellyfin/env/k3s-cluster/ingress.yaml | 21 +++++++++++++++++++ .../env/k3s-cluster/kustomization.yaml | 3 ++- apps/kavita/base/service.yaml | 5 +---- apps/kavita/env/k3s-cluster/ingress.yaml | 21 +++++++++++++++++++ .../kavita/env/k3s-cluster/kustomization.yaml | 3 ++- apps/kubernetes-dashboard/base/values.yaml | 2 +- apps/nexus/base/service.yaml | 2 +- apps/nexus/env/k3s-cluster/ingress.yaml | 21 +++++++++++++++++++ apps/nexus/env/k3s-cluster/kustomization.yaml | 3 ++- 10 files changed, 72 insertions(+), 14 deletions(-) create mode 100644 apps/jellyfin/env/k3s-cluster/ingress.yaml create mode 100644 apps/kavita/env/k3s-cluster/ingress.yaml create mode 100644 apps/nexus/env/k3s-cluster/ingress.yaml diff --git a/apps/jellyfin/base/values.yaml b/apps/jellyfin/base/values.yaml index b3fa711..f10c367 100644 --- a/apps/jellyfin/base/values.yaml +++ b/apps/jellyfin/base/values.yaml @@ -20,11 +20,6 @@ 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 new file mode 100644 index 0000000..4393b1b --- /dev/null +++ b/apps/jellyfin/env/k3s-cluster/ingress.yaml @@ -0,0 +1,21 @@ +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.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 a227ac4..3ea3085 100644 --- a/apps/jellyfin/env/k3s-cluster/kustomization.yaml +++ b/apps/jellyfin/env/k3s-cluster/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../base + - ./ingress.yaml \ No newline at end of file diff --git a/apps/kavita/base/service.yaml b/apps/kavita/base/service.yaml index b0eab3e..3e46ce7 100644 --- a/apps/kavita/base/service.yaml +++ b/apps/kavita/base/service.yaml @@ -3,14 +3,11 @@ kind: Service metadata: name: kavita namespace: kavita - annotations: - metallb.universe.tf/address-pool: k3s-cluster-ip-pool - metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: kavita app.kubernetes.io/instance: kavita spec: - type: LoadBalancer + type: ClusterIP ports: - port: 5000 targetPort: 5000 diff --git a/apps/kavita/env/k3s-cluster/ingress.yaml b/apps/kavita/env/k3s-cluster/ingress.yaml new file mode 100644 index 0000000..0663b2f --- /dev/null +++ b/apps/kavita/env/k3s-cluster/ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: kavita-ingress + namespace: kavita + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/use-regex: "true" +spec: + ingressClassName: nginx + rules: + - host: "kavita.cluster.edward.sydney" + http: + paths: + - pathType: Prefix + path: "/" + backend: + service: + name: kavita + port: + number: 5000 \ No newline at end of file diff --git a/apps/kavita/env/k3s-cluster/kustomization.yaml b/apps/kavita/env/k3s-cluster/kustomization.yaml index a227ac4..3ea3085 100644 --- a/apps/kavita/env/k3s-cluster/kustomization.yaml +++ b/apps/kavita/env/k3s-cluster/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../base + - ./ingress.yaml \ No newline at end of file diff --git a/apps/kubernetes-dashboard/base/values.yaml b/apps/kubernetes-dashboard/base/values.yaml index 1908567..007cea9 100644 --- a/apps/kubernetes-dashboard/base/values.yaml +++ b/apps/kubernetes-dashboard/base/values.yaml @@ -1,6 +1,6 @@ app: ingress: - enabled: false + enabled: true hosts: - k3s-dashboard.cluster.edward.sydney ingressClassName: nginx diff --git a/apps/nexus/base/service.yaml b/apps/nexus/base/service.yaml index cbd982c..4ed8894 100644 --- a/apps/nexus/base/service.yaml +++ b/apps/nexus/base/service.yaml @@ -10,7 +10,7 @@ metadata: spec: selector: app: nexus - type: LoadBalancer + type: ClusterIP ports: - port: 8081 targetPort: 8081 \ No newline at end of file diff --git a/apps/nexus/env/k3s-cluster/ingress.yaml b/apps/nexus/env/k3s-cluster/ingress.yaml new file mode 100644 index 0000000..f88db79 --- /dev/null +++ b/apps/nexus/env/k3s-cluster/ingress.yaml @@ -0,0 +1,21 @@ +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: nexus-ingress + namespace: nexus + annotations: + nginx.ingress.kubernetes.io/ssl-redirect: "false" + nginx.ingress.kubernetes.io/use-regex: "true" +spec: + ingressClassName: nginx + rules: + - host: "nexus.cluster.edward.sydney" + http: + paths: + - pathType: Prefix + path: "/" + backend: + service: + name: nexus + port: + number: 8081 \ No newline at end of file diff --git a/apps/nexus/env/k3s-cluster/kustomization.yaml b/apps/nexus/env/k3s-cluster/kustomization.yaml index a227ac4..3ea3085 100644 --- a/apps/nexus/env/k3s-cluster/kustomization.yaml +++ b/apps/nexus/env/k3s-cluster/kustomization.yaml @@ -1,4 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base \ No newline at end of file + - ../../base + - ./ingress.yaml \ No newline at end of file