From d38b1fec14361e99a4d41c2772efd85a962f0b14 Mon Sep 17 00:00:00 2001 From: Edward Cheng Date: Mon, 26 Aug 2024 17:13:12 +1000 Subject: [PATCH] change to LB for services kavita, trillium and vaultwarden --- apps/kavita/base/service.yaml | 5 ++++- apps/kavita/env/k3s-cluster/ingress.yaml | 21 ------------------- .../kavita/env/k3s-cluster/kustomization.yaml | 3 +-- apps/trillium/base/service.yaml | 5 ++++- apps/trillium/env/k3s-cluster/ingress.yaml | 21 ------------------- .../env/k3s-cluster/kustomization.yaml | 3 +-- apps/vaultwarden/base/service.yaml | 5 ++++- apps/vaultwarden/env/k3s-cluster/ingress.yaml | 21 ------------------- .../env/k3s-cluster/kustomization.yaml | 3 +-- 9 files changed, 15 insertions(+), 72 deletions(-) delete mode 100644 apps/kavita/env/k3s-cluster/ingress.yaml delete mode 100644 apps/trillium/env/k3s-cluster/ingress.yaml delete mode 100644 apps/vaultwarden/env/k3s-cluster/ingress.yaml diff --git a/apps/kavita/base/service.yaml b/apps/kavita/base/service.yaml index 3e46ce7..b0eab3e 100644 --- a/apps/kavita/base/service.yaml +++ b/apps/kavita/base/service.yaml @@ -3,11 +3,14 @@ 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: ClusterIP + type: LoadBalancer ports: - port: 5000 targetPort: 5000 diff --git a/apps/kavita/env/k3s-cluster/ingress.yaml b/apps/kavita/env/k3s-cluster/ingress.yaml deleted file mode 100644 index 8d9b84b..0000000 --- a/apps/kavita/env/k3s-cluster/ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -#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 ef7a630..a227ac4 100644 --- a/apps/kavita/env/k3s-cluster/kustomization.yaml +++ b/apps/kavita/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/trillium/base/service.yaml b/apps/trillium/base/service.yaml index 5b96552..6655d4e 100644 --- a/apps/trillium/base/service.yaml +++ b/apps/trillium/base/service.yaml @@ -3,12 +3,15 @@ kind: Service metadata: name: trillium namespace: trillium + annotations: + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: trillium spec: selector: app.kubernetes.io/name: trillium - type: ClusterIP + type: LoadBalancer internalTrafficPolicy: Cluster ports: - protocol: TCP diff --git a/apps/trillium/env/k3s-cluster/ingress.yaml b/apps/trillium/env/k3s-cluster/ingress.yaml deleted file mode 100644 index c9b0258..0000000 --- a/apps/trillium/env/k3s-cluster/ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -#apiVersion: networking.k8s.io/v1 -#kind: Ingress -#metadata: -# name: trillium-ingress -# namespace: trillium -# annotations: -# nginx.ingress.kubernetes.io/ssl-redirect: "false" -# nginx.ingress.kubernetes.io/use-regex: "true" -#spec: -# ingressClassName: nginx -# rules: -# - host: "trillium.cluster.edward.sydney" -# http: -# paths: -# - pathType: Prefix -# path: "/" -# backend: -# service: -# name: trillium -# port: -# number: 8080 \ No newline at end of file diff --git a/apps/trillium/env/k3s-cluster/kustomization.yaml b/apps/trillium/env/k3s-cluster/kustomization.yaml index ef7a630..a227ac4 100644 --- a/apps/trillium/env/k3s-cluster/kustomization.yaml +++ b/apps/trillium/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/vaultwarden/base/service.yaml b/apps/vaultwarden/base/service.yaml index 936074f..df37c2c 100644 --- a/apps/vaultwarden/base/service.yaml +++ b/apps/vaultwarden/base/service.yaml @@ -3,12 +3,15 @@ kind: Service metadata: name: vaultwarden namespace: vaultwarden + annotations: + metallb.universe.tf/address-pool: k3s-cluster-ip-pool + metallb.universe.tf/allow-shared-ip: k3s-cluster labels: app.kubernetes.io/name: vaultwarden spec: selector: app.kubernetes.io/name: vaultwarden - type: ClusterIP + type: LoadBalancer internalTrafficPolicy: Cluster ports: - protocol: TCP diff --git a/apps/vaultwarden/env/k3s-cluster/ingress.yaml b/apps/vaultwarden/env/k3s-cluster/ingress.yaml deleted file mode 100644 index 5db6b08..0000000 --- a/apps/vaultwarden/env/k3s-cluster/ingress.yaml +++ /dev/null @@ -1,21 +0,0 @@ -#apiVersion: networking.k8s.io/v1 -#kind: Ingress -#metadata: -# name: vaultwarden-ingress -# namespace: vaultwarden -# annotations: -# nginx.ingress.kubernetes.io/ssl-redirect: "false" -# nginx.ingress.kubernetes.io/use-regex: "true" -#spec: -# ingressClassName: nginx -# rules: -# - host: "vaultwarden.cluster.edward.sydney" -# http: -# paths: -# - pathType: Prefix -# path: "/" -# backend: -# service: -# name: vaultwarden -# port: -# number: 11080 \ No newline at end of file diff --git a/apps/vaultwarden/env/k3s-cluster/kustomization.yaml b/apps/vaultwarden/env/k3s-cluster/kustomization.yaml index ef7a630..a227ac4 100644 --- a/apps/vaultwarden/env/k3s-cluster/kustomization.yaml +++ b/apps/vaultwarden/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