diff --git a/bootstrap/kustomizations/kustomization-qbittorrent.yaml b/bootstrap/kustomizations/kustomization-media.yaml similarity index 85% rename from bootstrap/kustomizations/kustomization-qbittorrent.yaml rename to bootstrap/kustomizations/kustomization-media.yaml index 09cd774..771e9ab 100644 --- a/bootstrap/kustomizations/kustomization-qbittorrent.yaml +++ b/bootstrap/kustomizations/kustomization-media.yaml @@ -1,11 +1,11 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1 kind: Kustomization metadata: - name: qbittorrent + name: media namespace: flux-system spec: interval: 15m - path: ./qbittorrent + path: ./media prune: true # remove any elements later removed from the above path timeout: 2m # if not set, this defaults to interval duration, which is 1h sourceRef: @@ -15,4 +15,4 @@ spec: - apiVersion: apps/v1 kind: Deployment name: qbittorrent - namespace: qbittorrent + namespace: media diff --git a/bootstrap/namespaces/namespace-qbittorrent.yaml b/bootstrap/namespaces/namespace-media.yaml similarity index 67% rename from bootstrap/namespaces/namespace-qbittorrent.yaml rename to bootstrap/namespaces/namespace-media.yaml index 6bf78a7..d592f0d 100644 --- a/bootstrap/namespaces/namespace-qbittorrent.yaml +++ b/bootstrap/namespaces/namespace-media.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: qbittorrent + name: media diff --git a/media/pvc-data.yaml b/media/pvc-data.yaml index 3fc12c2..5bb1c9f 100644 --- a/media/pvc-data.yaml +++ b/media/pvc-data.yaml @@ -6,7 +6,7 @@ metadata: spec: accessModes: - ReadWriteMany - storageClassName: longhorn + storageClassName: nfs-client resources: requests: - storage: 230Gi + storage: 5Ti diff --git a/media/qbittorrent/deployment.yaml b/media/qbittorrent/deployment.yaml index 8b5ab14..0498bdb 100644 --- a/media/qbittorrent/deployment.yaml +++ b/media/qbittorrent/deployment.yaml @@ -64,5 +64,3 @@ spec: - name: wireguard-config-secret secret: secretName: wireguard-config-secret - - diff --git a/media/qbittorrent/qbittorrent-config.yaml b/media/qbittorrent/qbittorrent-config.yaml index bfc67b3..fea204e 100644 --- a/media/qbittorrent/qbittorrent-config.yaml +++ b/media/qbittorrent/qbittorrent-config.yaml @@ -6,4 +6,3 @@ metadata: data: PUID: "1000" PGID: "1000" - DOCKER_MODS: arafatamim/linuxserver-io-mod-vuetorrent diff --git a/media/qbittorrent/wireguard-config-secret.yaml b/media/qbittorrent/wireguard-config-secret.yaml index e4df204..67cd8d9 100644 --- a/media/qbittorrent/wireguard-config-secret.yaml +++ b/media/qbittorrent/wireguard-config-secret.yaml @@ -11,4 +11,4 @@ spec: namespace: media creationTimestamp: encryptedData: - wg0.conf: AgBl96INYxQD4Pr5dxYnRmUfhfgCT6v+R+anYAvk/ETJT6RbEF9AhFB7hOe0blxDxLo61R36P7vh9DpCSBP23JHVEZroIW6uT2M9l8hrGEgVcjZ59d7oCI+/OJnKsFJfBJsBvQRX5WFG25Mr0qXFFYtKVisP2uZrZa/vIZ1Cz16N89Lmbqy8CXSKP4R5M89KrqyH0q85J4kg9NtsZlh9mfWfelb96/BwbWVNuAP+dT3dvx/L0uWgvSj07ks8sxDVlBUJ5hccA3Z6Rg4x2x1tRl5sXFTuGmnkNYR6fFCiomt/YJCczRzF7hUgL3LLml8Sk33xlX8u7dNK0J8byYvEokSD3ZDxLsZLmFTgps3gj3yKa2Q8dRhXZp4o+OBUHT2DFyrNWdw0Km6EAMwJ13G3Lvmif2TXoronbYa8JA+mcV93LpOC1Aubj1QjFTkrK3/4u3DIPK0XmjXS6TeHLD5Rxx8VQIojwWeGTEJRCuvSE2vrxeqv1KQ2Q7OuOyFjAxxlpdVKBdXNnrYAg/yT0zTLZuNBeKRgCCykX0CM+sB/72f606i2ZNLqWI4NAivk99y19Yk7M+iw92qWecAfk1QwYwwdUKUZLqVOtYToHpOKAhZULYy1edTwRbZo+tx+BB1c0z1KVD6j3GiyjDifNME+h5PNLmQplMDHeKZd2mZxaEkwAe++brktnySKkxHxSOMizxkN2wVScqN7lwJfjswV3WOwGcl0V6XXGf59XP5qHDDIAfbYJN/2e//fw1ccYMNrhMFCt3eYvzufQLcCDGsSQxuJa69z4NQT6L4P5LwKCzIef79mJ3ZrTQXMsU55eg42AKPLsympV5GJ8UAYlviGd3n0quLb/LsG0HbnNhw+iHdQw6gtfQWxXI3pdBzx+d4Cel0nS8eyRriBPNHUYN91aJo+afFre/ADMNZq6aqW4eoUmgpHuIjkfVBkvRWQiDCLJjJvb4JcdgwxJUjzfGU3rLKX/G0cGHzXySMwZaojQS3cE0AzGMcSlybSDbEbeDtBKzDhJ4cE44Tv8qVGRyihScEE84dXeRdU8flz8i36jGbD7wA9ID80QfP8NhyU7HS+z9xhnzgo05FWbQun+E19RSXDfTg251s7UshT+/4y3XXU22aD2IoWTG+Qd6A5/KAXf02YGBkkDN1pz0ANKCvK1EdfOWe/42pKGYqaf/z+ + wg0.conf: AgC02zKiv9HIBMB7cmPgtx/mzUYUw7nKmp6NeUpblGsKI9v51P/Z1VrQlZNVmKlDOnYZu0aXGsH+CWmNyHJrR4jRCXtdZVG7y41tbHz2BxKRZGnbGPUKXop46LytXnuTL1NGrS00khQ9sI1nZKHd3vzZLiYXzVDVcdLpu+Mfbm/mPqlTszUCLI8MZ8usHGPDUVFovqA2OUdcnx+Z+VVmAoraDWfiDER5C0IIOm3Gdygu04WxNOU4Wx7y1NQR84D1xD6F7s+hTOQl2whpnoTpEbJ+RXFXBlpcf1J9S4V32Q09jE7s8Kq5f8wbYcuyzfoykiCs7RSy9a6rqgwCbNFtjUVGAmr6Ex3cLtBwpJF6mZ2fWhIqTonGAHpsSmtUOYZy44/K5axdGvdz479WNyqsaQg4WYfQpFwjSTWxv6q/4cYSRe0C0ukSkiFwuVa9IeBpG6XLR3nm/e+6LZ/qHs9Iv5iOgyAZXYLHYbEUdyhX1PQTFfVoAcIQUXvefoxyDAf29oX0dj6/zKcvKUSQMX6YoNsbqRpX7vR/d4NDHv7j615XZNiDsiKDNVZf/EDaGhuROQvrCn2dZQiIjzA1k6mTaB42soXfCx/KYt2moTGlLblhDJoc1BwFd1tp1RabfaVgZuXDTx2Gtkt9q8NvRpM26KdAgXzc4JxDKhzQSRmm9rPxMqldi3opqAuArk9xBnL2fgrLpxYdZ2+T1FnQOdg4coGbngj/6CApJ9yUodjJZGouYwuN5OVw4mi3Rifd10rLemSjfaL1KZsMuHwtsMINPHTOnEQSSdiZGExduZt8rOgFcr7Z9cf0IUubh/kC7uzq1K0Bz5Z+6A/x1O+pTkfa2eBP15ZBfC8YFAojc6fCTA8+WDLYXfJalyKT+IdaH2OU1H1wZtMXd72c1hLWJF5jG/hBy0iPTb8bK1wZpmWpuYRKuToEpLd/3niPY43F6ci+QsbKXHdlHe+D3JPpHHboGCkObNzS5y0Kj6TgYuKdR8BqrSsxZPNYN8ng4EZpLS9Az3KQU3x/pG/zX6qUuFWoPODS/ZShNKi04lZLhWgLRX5dypgGmSI6bMk6ELOdPZgSQupphEykysmFf2T323j9FuFSSfBzuCzBL3ef+Tn37jWoHSz0aXMaMCLmoqsWwFSoYn1zwDLV/NaFZIEbTwOn6Xq6U0tNn+DT1/P/sBFM diff --git a/qbittorrent/deployment.yaml b/qbittorrent/deployment.yaml deleted file mode 100644 index 5100b75..0000000 --- a/qbittorrent/deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: qbittorrent - namespace: qbittorrent -spec: - selector: - matchLabels: - app: qbittorrent - template: - metadata: - labels: - app: qbittorrent - spec: - containers: - - name: qbittorrent - image: lscr.io/linuxserver/qbittorrent:latest - envFrom: - - configMapRef: - name: qbittorrent-config - optional: false - ports: - - containerPort: 8080 - name: http - protocol: TCP - volumeMounts: - - name: qbittorrent-config - mountPath: /config - - name: data - mountPath: /data/downloads - subPath: downloads - - name: gluetun - image: qmcgaw/gluetun - envFrom: - - configMapRef: - name: gluetun-config - securityContext: - capabilities: - add: - - NET_ADMIN - volumeMounts: - - name: wireguard-config-secret - mountPath: /gluetun/wireguard - initContainers: - - name: init-media-filesystem - image: busybox - command: - - /bin/sh - - -c - - | - mkdir -p -v /data/downloads/movies /data/downloads/tv /data/downloads/books /data/downloads/audiobooks /data/media/movies /data/media/tv /data/media/books /data/media/audiobooks - chown -R 1000:1000 /data - chmod -R a=,a+rX,u+w,g+w /data - volumeMounts: - - mountPath: /data - name: data - volumes: - - name: qbittorrent-config - persistentVolumeClaim: - claimName: qbittorrent-config - - name: data - persistentVolumeClaim: - claimName: data - - name: wireguard-config-secret - secret: - secretName: wireguard-config-secret diff --git a/qbittorrent/dns-endpoint.yaml b/qbittorrent/dns-endpoint.yaml deleted file mode 100644 index f897364..0000000 --- a/qbittorrent/dns-endpoint.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: externaldns.k8s.io/v1alpha1 -kind: DNSEndpoint -metadata: - name: qbittorrent.michaelthomson.dev - namespace: qbittorrent -spec: - endpoints: - - dnsName: qbittorrent.michaelthomson.dev - recordTTL: 180 - recordType: CNAME - targets: - - server.michaelthomson.dev diff --git a/qbittorrent/gluetun-config.yaml b/qbittorrent/gluetun-config.yaml deleted file mode 100644 index c89745a..0000000 --- a/qbittorrent/gluetun-config.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: gluetun-config - namespace: qbittorrent -data: - VPN_SERVICE_PROVIDER: custom - VPN_TYPE: wireguard - VPN_PORT_FORWARDING: on - VPN_PORT_FORWARDING_PROVIDER: protonvpn diff --git a/qbittorrent/ingress.yaml b/qbittorrent/ingress.yaml deleted file mode 100644 index d0bdfb7..0000000 --- a/qbittorrent/ingress.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: qbittorrent - namespace: qbittorrent - annotations: - traefik.ingress.kubernetes.io/router.entrypoints: websecure - traefik.ingress.kubernetes.io/router.middlewares: traefik-authentik@kubernetescrd - traefik.ingress.kubernetes.io/router.tls: "true" -spec: - rules: - - host: qbittorrent.michaelthomson.dev - http: - paths: - - pathType: ImplementationSpecific - path: / - backend: - service: - name: qbittorrent - port: - name: http - tls: - - hosts: - - qbittorrent.michaelthomson.dev - secretName: letsencrypt-wildcard-cert-michaelthomson.dev diff --git a/qbittorrent/pvc-data.yaml b/qbittorrent/pvc-data.yaml deleted file mode 100644 index 45cd8f3..0000000 --- a/qbittorrent/pvc-data.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: data - namespace: qbittorrent -spec: - accessModes: - - ReadWriteOnce - storageClassName: nfs-client - resources: - requests: - storage: 5Ti diff --git a/qbittorrent/pvc-qbittorrent-config.yaml b/qbittorrent/pvc-qbittorrent-config.yaml deleted file mode 100644 index 0a0646c..0000000 --- a/qbittorrent/pvc-qbittorrent-config.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: qbittorrent-config - namespace: qbittorrent -spec: - resources: - requests: - storage: 50Gi - storageClassName: longhorn - accessModes: - - ReadWriteOnce diff --git a/qbittorrent/qbittorrent-config.yaml b/qbittorrent/qbittorrent-config.yaml deleted file mode 100644 index 0d80b0f..0000000 --- a/qbittorrent/qbittorrent-config.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: qbittorrent-config - namespace: qbittorrent -data: - PUID: "1000" - PGID: "1000" diff --git a/qbittorrent/service.yaml b/qbittorrent/service.yaml deleted file mode 100644 index 597245d..0000000 --- a/qbittorrent/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: qbittorrent - namespace: qbittorrent -spec: - selector: - app: qbittorrent - ports: - - port: 80 - targetPort: http - name: http diff --git a/qbittorrent/wireguard-config-secret.yaml b/qbittorrent/wireguard-config-secret.yaml deleted file mode 100644 index b38fcfc..0000000 --- a/qbittorrent/wireguard-config-secret.yaml +++ /dev/null @@ -1,14 +0,0 @@ -kind: SealedSecret -apiVersion: bitnami.com/v1alpha1 -metadata: - name: wireguard-config-secret - namespace: qbittorrent - creationTimestamp: -spec: - template: - metadata: - name: wireguard-config-secret - namespace: qbittorrent - creationTimestamp: - encryptedData: - wg0.conf: AgDdF/rwKFANlByNG4But/CCqBC0BlQECdh4KartOeFaraA5EdqTo3G59q5uaC3nPmtyWFrzisi4nHORJc4rLDnhkg4l183WA4uVkry7KX8clO5yxZ5MeufnOjS/Mus81ckf1D+KWwUz1Z+N5N6kEa65bcnX3umqAc+i9dzjP0Ns+1eTVHwsSKJB+sbaDCN4+EeTjSYPfu3or52iJ/UACvK3ZnfCRiSYOUwl2dzOhioIKZZ6IF7uLqrHPXcJtU0X9CgTgsKou5LIuj1cNkXhaJLUWfNAaXP66rhtsBxs3SQw4rEi06nqm5201wSK2r5DSFiG3ndLbgn/4titKN0J5fa/IGq0aUPCI4x71qFoWcbq/oQnItk5QLCERGykElslKsaDphZwkFLuUYA53hXEsmqduuNKRrXpn0d+ic7O4McwtdyZkK6DVNiI+kzjSL8BipZmoAZg6LUXHcV0vTqsSly50QzTOfNtUh19XK8eBuDAtWHbd0KhXOok5IWu63eTsFUgxbCPF7Ua2tVieMLqwc5zw3GFiCfmcE7LUjr0g8KBEoKKtNo5pDv8Znvb7LjcPNNxJF6MDMmQpA1Krc7HYaEnZNRisFpaRcgpI3Ds82TnX/TCT562dqvpsado7fPqHTeonyo/47T8ZfATgBbwvya8e+8BZdXpNmJL88KR7tCOTUYLWD8UBZYb9McC7YIef5XKhTe+dvZatp6cZ9cWyx4iWWsgwsNMZgF9fGDKg6KLjk2bLZ493pkjXn6tOedCWes8DNzPug/1bmzi/OKHlDy4k7kVCB2kQVNdQbgKHr5eA4ueG27/OjWcs3jQ9WtXt6hAw5ljeKbmmKLQruw6Ss02Zq7toourNBmJXmmeNN8i4em7e5BiEhzRDVNPmtrJUnW7qPkvi7cTZXnjshkEa3+HN2k3Z6oiFay/KJ1/UyfR3v83GIpAjh/CpYA2q3QDWc2l2+NEUMUJkVkCZC4gUkrP5LRYGvsIumnshbTgftqBzWexnSWiHBSOYbGf4li3ICwZlbxgU6j0w75K+bNCaKvXjawlHNtdD7zbpL5TMF4W2OiSD2ddjpSUXh0rnYahfvkEAWLjRJKL+Mw/lp7YJ8UHD/gqQM4nE/FHB3TxvOnp6ERLOWkquRWLiN2j6NXVZqXcZDxUu8hteJNRhqI2UDJinV0ErD3FucK800lB