diff --git a/manifests/apply.sh b/manifests/apply.sh index 0907a9d..b9dea74 100755 --- a/manifests/apply.sh +++ b/manifests/apply.sh @@ -35,6 +35,7 @@ helm upgrade --install cnpg \ -f values/cnpg.yaml \ --wait sleep 5 +./tailscale/apply.sh kubectl apply -k . ./immich/apply.sh diff --git a/manifests/databases/postgres-pgadmin.yaml b/manifests/databases/postgres-pgadmin.yaml index 0a4ce1f..220fbf1 100644 --- a/manifests/databases/postgres-pgadmin.yaml +++ b/manifests/databases/postgres-pgadmin.yaml @@ -91,17 +91,13 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: ingress-pgadmin - annotations: - ingressClassName: traefik spec: - rules: - - host: pgadmin.kubernetes - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: service-pgadmin - port: - number: 80 + ingressClassName: tailscale + defaultBackend: + service: + name: service-pgadmin + port: + number: 80 + tls: + - hosts: + - pgadmin diff --git a/manifests/helm/longhorn.yaml b/manifests/helm/longhorn.yaml index e72e098..0a3952e 100644 --- a/manifests/helm/longhorn.yaml +++ b/manifests/helm/longhorn.yaml @@ -87,6 +87,22 @@ spec: --- apiVersion: networking.k8s.io/v1 kind: Ingress +metadata: + name: longhorn-ingress-tailscale + namespace: longhorn-system +spec: + ingressClassName: tailscale + defaultBackend: + service: + name: longhorn-frontend + port: + number: 80 + tls: + - hosts: + - longhorn +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress metadata: name: longhorn-ingress namespace: longhorn-system diff --git a/manifests/immich/ingress.yaml b/manifests/immich/ingress.yaml index 9ccb756..d9d9e67 100644 --- a/manifests/immich/ingress.yaml +++ b/manifests/immich/ingress.yaml @@ -22,5 +22,19 @@ spec: name: immich-server port: name: http - - <<: *host - host: immich.thehellings.com +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + namespace: immich + name: immich-ingress-tailscale +spec: + defaultBackend: + service: + name: immich-server + port: + name: http + ingressClassName: tailscale + tls: + - hosts: + - immich diff --git a/manifests/matrix/ingress.yaml b/manifests/matrix/ingress.yaml index 450bc05..9c6f684 100644 --- a/manifests/matrix/ingress.yaml +++ b/manifests/matrix/ingress.yaml @@ -1,21 +1,15 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: dendrite-ingress - annotations: - ingressClassName: traefik + namespace: matrix + name: dendrite-ingress-tailscale spec: - rules: - - &host - host: matrix.kubernetes - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: dendrite - port: - number: 8008 - - <<: *host - host: matrix.thehellings.com + ingressClassName: tailscale + defaultBackend: + service: + name: dendrite + port: + number: 8008 + tls: + - hosts: + - matrix diff --git a/manifests/tailscale/apply.sh b/manifests/tailscale/apply.sh new file mode 100755 index 0000000..5ecb10f --- /dev/null +++ b/manifests/tailscale/apply.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +helm repo add tailscale https://pkgs.tailscale.com/helmcharts + +helm repo update tailscale + +helm upgrade \ + --install \ + tailscale-operator \ + tailscale/tailscale-operator \ + --namespace=tailscale \ + --create-namespace \ + --set-string oauth.clientId="$(bw get username 'ffa188a4-63b2-4926-99f0-b33b0021a4f4')" \ + --set-string oauth.clientSecret="$(bw get password 'ffa188a4-63b2-4926-99f0-b33b0021a4f4')" \ + --wait diff --git a/modules/hm/gui/bookmarks.nix b/modules/hm/gui/bookmarks.nix index cbe88d0..abeba7c 100644 --- a/modules/hm/gui/bookmarks.nix +++ b/modules/hm/gui/bookmarks.nix @@ -208,14 +208,14 @@ bookmarks = [ { name = "Longhorn"; - url = "http://longhorn.kubernetes"; + url = "http://longhorn.shire-zebra.ts.net"; + } + { + name = "PGAdmin4"; + url = "http://pgadmin.shire-zebra.ts.net/"; } ]; } - { - name = "PGAdmin4"; - url = "http://pgadmin.kubernetes/"; - } { name = "Password Hash"; url = "https://unix4lyfe.org/crypt/";