diff --git a/services/abs-kosync-bridge/abs-kosync-deployment.yaml b/services/abs-kosync-bridge/abs-kosync-deployment.yaml index 2cc8d6b..eed067b 100644 --- a/services/abs-kosync-bridge/abs-kosync-deployment.yaml +++ b/services/abs-kosync-bridge/abs-kosync-deployment.yaml @@ -49,9 +49,9 @@ spec: path: /k3s/abs-kosync-bridge - name: abs-kosync-books nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/books - name: abs-kosync-audiobooks nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/audiobooks diff --git a/services/audiobookshelf/audiobookshelf-deployment.yaml b/services/audiobookshelf/audiobookshelf-deployment.yaml index 79d4b05..ec01a31 100644 --- a/services/audiobookshelf/audiobookshelf-deployment.yaml +++ b/services/audiobookshelf/audiobookshelf-deployment.yaml @@ -45,11 +45,11 @@ spec: volumes: - name: audiobookshelf-audiobooks nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/audiobooks - name: audiobookshelf-podcasts nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/podcasts - name: audiobookshelf-config nfs: diff --git a/services/bazarr-anime/bazarr-anime-deployment.yaml b/services/bazarr-anime/bazarr-anime-deployment.yaml index a3ae6a3..0396ff1 100644 --- a/services/bazarr-anime/bazarr-anime-deployment.yaml +++ b/services/bazarr-anime/bazarr-anime-deployment.yaml @@ -49,5 +49,5 @@ spec: path: /k3s/bazarr-anime - name: bazarr-anime-media nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media diff --git a/services/bazarr/bazarr-deployment.yaml b/services/bazarr/bazarr-deployment.yaml index e9288cc..97da3d6 100644 --- a/services/bazarr/bazarr-deployment.yaml +++ b/services/bazarr/bazarr-deployment.yaml @@ -49,5 +49,5 @@ spec: path: /k3s/bazarr - name: bazarr-media nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media diff --git a/services/calibre-web/calibre-web-deployment.yaml b/services/calibre-web/calibre-web-deployment.yaml index 6ab62aa..4faa242 100644 --- a/services/calibre-web/calibre-web-deployment.yaml +++ b/services/calibre-web/calibre-web-deployment.yaml @@ -22,9 +22,6 @@ spec: containers: - name: calibre-web image: crocodilestick/calibre-web-automated:latest - envFrom: - - secretRef: - name: calibre-web-secret env: - name: PUID value: "1000" @@ -57,5 +54,5 @@ spec: path: /k3s/calibre-web - name: calibre-web-library nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/books/calibre-library diff --git a/services/calibre-web/calibre-web-external-secrets.yaml b/services/calibre-web/calibre-web-external-secrets.yaml deleted file mode 100644 index 3430bcd..0000000 --- a/services/calibre-web/calibre-web-external-secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: calibre-web-credentials - namespace: default -spec: - refreshInterval: "1h" - secretStoreRef: - name: vault-external-secrets-store - kind: ClusterSecretStore - target: - name: calibre-web-secret - creationPolicy: Owner - data: - - secretKey: OIDC_CLIENT_ID - remoteRef: - key: oauth2-proxy/calibre-web - property: client-id - - secretKey: OIDC_CLIENT_SECRET - remoteRef: - key: oauth2-proxy/calibre-web - property: client-secret diff --git a/services/deluge/deluge-deployment.yaml b/services/deluge/deluge-deployment.yaml index 5da7caf..8ee594e 100644 --- a/services/deluge/deluge-deployment.yaml +++ b/services/deluge/deluge-deployment.yaml @@ -60,5 +60,5 @@ spec: path: /k3s/deluge - name: deluge-media nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/jellyfin/jellyfin-deployment.yaml b/services/jellyfin/jellyfin-deployment.yaml index 4cdb440..8de5746 100644 --- a/services/jellyfin/jellyfin-deployment.yaml +++ b/services/jellyfin/jellyfin-deployment.yaml @@ -53,5 +53,5 @@ spec: path: /k3s/jellyfin/cache - name: yarr nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media diff --git a/services/jellyfin/jellyfin-ingress.yaml b/services/jellyfin/jellyfin-ingress.yaml index a21b5d1..9cd1b5c 100644 --- a/services/jellyfin/jellyfin-ingress.yaml +++ b/services/jellyfin/jellyfin-ingress.yaml @@ -19,21 +19,21 @@ metadata: traefik.ingress.kubernetes.io/router.tls: "true" traefik.ingress.kubernetes.io/router.middlewares: default-jellyfin-proxy-headers@kubernetescrd spec: - # tls: - # - hosts: - # - beak.mynest.love - # secretName: jellyfin-tls + tls: + - hosts: + - beak.mynest.love + secretName: jellyfin-tls rules: - # - host: beak.mynest.love - # http: - # paths: - # - path: / - # pathType: Prefix - # backend: - # service: - # name: jellyfin - # port: - # name: http-web + - host: beak.mynest.love + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: jellyfin + port: + name: http-web - host: jellyfin.k3s.home.nest http: paths: diff --git a/services/lazy-librarian/lazylibrarian-account.yaml b/services/lazy-librarian/lazylibrarian-account.yaml deleted file mode 100644 index be6eb67..0000000 --- a/services/lazy-librarian/lazylibrarian-account.yaml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: lazylibrarian-sa - namespace: default ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRoleBinding -metadata: - name: lazylibrarian-auth-delegator -subjects: -- kind: ServiceAccount - name: lazylibrarian-sa - namespace: default -roleRef: - kind: ClusterRole - name: system:auth-delegator - apiGroup: rbac.authorization.k8s.io diff --git a/services/lazy-librarian/lazylibrarian-deployment.yaml b/services/lazy-librarian/lazylibrarian-deployment.yaml index 42ade99..b8ac28e 100644 --- a/services/lazy-librarian/lazylibrarian-deployment.yaml +++ b/services/lazy-librarian/lazylibrarian-deployment.yaml @@ -19,17 +19,9 @@ spec: annotations: kompose.cmd: kompose convert -f compose-ll.yaml kompose.version: 1.38.0 (HEAD) - vault.hashicorp.com/agent-inject: "true" - vault.hashicorp.com/role: "lazylibrarian-role" - vault.hashicorp.com/agent-inject-secret-credentials: "secret/data/lazylibrarian/config" - vault.hashicorp.com/agent-inject-template-credentials: | - {{- with secret "secret/data/lazylibrarian/config" -}} - export HARDCOVER_API_KEY="{{ .Data.data.hardcover_api_key }}" - {{- end -}} labels: io.kompose.service: lazylibrarian spec: - serviceAccountName: lazylibrarian-sa containers: - env: - name: DOCKER_MODS @@ -61,9 +53,9 @@ spec: path: /k3s/lazy-librarian - name: lazylibrarian-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads - name: lazylibrarian-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr diff --git a/services/lidarr/lidarr-deployment.yaml b/services/lidarr/lidarr-deployment.yaml index bce4764..45766ca 100644 --- a/services/lidarr/lidarr-deployment.yaml +++ b/services/lidarr/lidarr-deployment.yaml @@ -53,9 +53,9 @@ spec: path: /k3s/lidarr - name: lidarr-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr - name: lidarr-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/navidrome/navidrome-deployment.yaml b/services/navidrome/navidrome-deployment.yaml index 89ebd06..09baf56 100644 --- a/services/navidrome/navidrome-deployment.yaml +++ b/services/navidrome/navidrome-deployment.yaml @@ -19,24 +19,11 @@ spec: annotations: kompose.cmd: kompose convert -f compose-navidrome.yaml kompose.version: 1.38.0 (HEAD) - vault.hashicorp.com/agent-inject: "true" - vault.hashicorp.com/role: "navidrome-role" - vault.hashicorp.com/agent-inject-secret-credentials: "secret/data/navidrome/config" - vault.hashicorp.com/agent-inject-template-credentials: | - {{- with secret "secret/data/navidrome/config" -}} - export ND_LASTFM_APIKEY="{{ .Data.data.lastfm_api_key }}" - export ND_LASTFM_SECRET="{{ .Data.data.lastfm_secret }}" - {{- end -}} labels: io.kompose.service: navidrome spec: - serviceAccountName: navidrome-sa containers: - env: - - name: ND_LASTFM_APIKEY - - name: ND_LASTFM_ENABLED - value: "true" - - name: ND_LASTFM_SECRET - name: TZ value: America/New_York image: deluan/navidrome:latest @@ -62,5 +49,5 @@ spec: path: /k3s/navidrome - name: navidrome-media nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/media/music diff --git a/services/radarr-anime/radarr-anime-deployment.yaml b/services/radarr-anime/radarr-anime-deployment.yaml index 161b4ef..a9d6840 100644 --- a/services/radarr-anime/radarr-anime-deployment.yaml +++ b/services/radarr-anime/radarr-anime-deployment.yaml @@ -51,9 +51,9 @@ spec: path: /k3s/radarr-anime - name: radarr-anime-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr - name: radarr-anime-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/radarr/radarr-deployment.yaml b/services/radarr/radarr-deployment.yaml index f9b73fb..e13c502 100644 --- a/services/radarr/radarr-deployment.yaml +++ b/services/radarr/radarr-deployment.yaml @@ -51,9 +51,9 @@ spec: path: /k3s/radarr - name: radarr-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr - name: radarr-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/sabnzbd/sabnzbd-deployment.yaml b/services/sabnzbd/sabnzbd-deployment.yaml index 4fc899b..00dd10c 100644 --- a/services/sabnzbd/sabnzbd-deployment.yaml +++ b/services/sabnzbd/sabnzbd-deployment.yaml @@ -49,5 +49,5 @@ spec: path: /k3s/sabnzbd - name: sabnzbd-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/slskd/slskd-deployment.yaml b/services/slskd/slskd-deployment.yaml index 840416d..9fadf3e 100644 --- a/services/slskd/slskd-deployment.yaml +++ b/services/slskd/slskd-deployment.yaml @@ -60,5 +60,5 @@ spec: path: /k3s/slskd - name: slskd-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/sonarr-anime/sonarr-anime-deployment.yaml b/services/sonarr-anime/sonarr-anime-deployment.yaml index 18c32ec..3da895c 100644 --- a/services/sonarr-anime/sonarr-anime-deployment.yaml +++ b/services/sonarr-anime/sonarr-anime-deployment.yaml @@ -51,9 +51,9 @@ spec: path: /k3s/sonarr-anime - name: sonarr-anime-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr - name: sonarr-anime-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/sonarr/sonarr-deployment.yaml b/services/sonarr/sonarr-deployment.yaml index c772a13..525c87c 100644 --- a/services/sonarr/sonarr-deployment.yaml +++ b/services/sonarr/sonarr-deployment.yaml @@ -51,9 +51,9 @@ spec: path: /k3s/sonarr - name: sonarr-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr - name: sonarr-downloads nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /yarr/downloads diff --git a/services/syncthing/syncthing-deployment.yaml b/services/syncthing/syncthing-deployment.yaml index b5da953..bf6fcd2 100644 --- a/services/syncthing/syncthing-deployment.yaml +++ b/services/syncthing/syncthing-deployment.yaml @@ -58,5 +58,5 @@ spec: path: /k3s/syncthing - name: syncthing-data nfs: - server: birdfeeder1.home.nest + server: robin.home.nest path: /mnt/raid/syncthing diff --git a/services/vault/vault-statefulset.yaml b/services/vault/vault-statefulset.yaml index 37641ab..581a536 100644 --- a/services/vault/vault-statefulset.yaml +++ b/services/vault/vault-statefulset.yaml @@ -46,11 +46,11 @@ spec: command: ["sh", "-c"] args: - | + set -e K8S_TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token) TRANSIT_TOKEN=$(vault write -field=token auth/kubernetes/login \ role=vault-unsealer \ - jwt=$K8S_TOKEN \ - address=http://vault-keykeeper.vault.svc.cluster.local:80) + jwt=$K8S_TOKEN) sed "s/REPLACE_WITH_TOKEN/$TRANSIT_TOKEN/" /etc/vault/extraconfig-from-values.hcl > /vault/runtime/vault.hcl securityContext: