diff --git a/k8s-wheatley/qbittorrent/configmap.yaml b/k8s-wheatley/qbittorrent/configmap.yaml index beb69f9..61c614d 100644 --- a/k8s-wheatley/qbittorrent/configmap.yaml +++ b/k8s-wheatley/qbittorrent/configmap.yaml @@ -12,7 +12,7 @@ data: VPN_PORT_FORWARDING_UP_COMMAND: "/scripts/port-up.sh" VPN_PORT_FORWARDING_DOWN_COMMAND: "/scripts/port-down.sh" FIREWALL_OUTBOUND_SUBNETS: 10.244.0.0/16,10.96.0.0/12 - FIREWALL_INPUT_PORTS: "8112,5030" + FIREWALL_INPUT_PORTS: "8112" --- apiVersion: v1 kind: ConfigMap @@ -43,22 +43,6 @@ data: --- apiVersion: v1 kind: ConfigMap -metadata: - name: slskd-envs -data: - TZ: Europe/Amsterdam - PUID: "1000" - PGID: "1000" - SLSKD_DOWNLOADS_DIR: /shared/media/downloads/_slsk-downloads - SLSKD_INCOMPLETE_DIR: /shared/media/downloads/_slsk-incomplete - SLSKD_SHARED_DIR: "[Music]/shared/media/downloads/_slsk-downloads" - SLSKD_REMOTE_CONFIGURATION: "true" - SLSKD_VPN: "true" - SLSKD_VPN_PORT_FORWARDING: "true" - SLSKD_VPN_GLUETUN_URL: http://localhost:8000 ---- -apiVersion: v1 -kind: ConfigMap metadata: name: unpackerr-envs data: diff --git a/k8s-wheatley/qbittorrent/deployments.yaml b/k8s-wheatley/qbittorrent/deployments.yaml index b6d35cd..5dba05a 100644 --- a/k8s-wheatley/qbittorrent/deployments.yaml +++ b/k8s-wheatley/qbittorrent/deployments.yaml @@ -21,21 +21,16 @@ spec: - name: gluetun image: ghcr.io/qdm12/gluetun ports: - - name: qbit-http + - name: http containerPort: 8112 protocol: TCP - - name: slskd-http - containerPort: 5030 - protocol: TCP envFrom: - configMapRef: name: gluetun-envs - - secretRef: - name: gluetun-env-secrets volumeMounts: - mountPath: /dev/net/tun name: dev-tun - - mountPath: /gluetun/wireguard + - mountPath: "/gluetun/wireguard" name: gluetun-wgconfig readOnly: true - name: gluetun-scripts @@ -124,30 +119,6 @@ spec: capabilities: drop: - "ALL" - - name: slskd - image: docker.io/slskd/slskd - imagePullPolicy: IfNotPresent - envFrom: - - configMapRef: - name: slskd-envs - - secretRef: - name: slskd-env-secrets - volumeMounts: - - mountPath: /config - name: slskd-config - - mountPath: /shared/media/downloads - name: nfs-media - securityContext: - seccompProfile: - type: RuntimeDefault - allowPrivilegeEscalation: false - capabilities: - drop: - - "ALL" - add: - - "CHOWN" - - "SETUID" - - "SETGID" volumes: - name: dev-tun hostPath: @@ -156,9 +127,6 @@ spec: - name: qbittorrent-config persistentVolumeClaim: claimName: qbittorrent-storage - - name: slskd-config - persistentVolumeClaim: - claimName: slskd-storage - name: gluetun-wgconfig secret: secretName: gluetun-wgconfig diff --git a/k8s-wheatley/qbittorrent/ingress.yaml b/k8s-wheatley/qbittorrent/ingress.yaml index e599673..4b77fad 100644 --- a/k8s-wheatley/qbittorrent/ingress.yaml +++ b/k8s-wheatley/qbittorrent/ingress.yaml @@ -14,46 +14,3 @@ spec: - backendRefs: - name: qbittorrent port: 80 - ---- -apiVersion: gateway.networking.k8s.io/v1 -kind: HTTPRoute -metadata: - name: slskd-route -spec: - parentRefs: - - name: internal - namespace: kube-system - sectionName: https - hostnames: - - "slskd.wheatley.in" - rules: - - backendRefs: - - name: slskd - port: 80 - ---- -apiVersion: v1 -kind: Service -metadata: - name: qbittorrent -spec: - selector: - app: qbittorrent - ports: - - port: 80 - protocol: TCP - targetPort: 8112 - ---- -apiVersion: v1 -kind: Service -metadata: - name: slskd -spec: - selector: - app: qbittorrent - ports: - - port: 80 - protocol: TCP - targetPort: 5030 diff --git a/k8s-wheatley/qbittorrent/kustomization.yaml b/k8s-wheatley/qbittorrent/kustomization.yaml index dfe93b6..68bd0ef 100644 --- a/k8s-wheatley/qbittorrent/kustomization.yaml +++ b/k8s-wheatley/qbittorrent/kustomization.yaml @@ -10,6 +10,7 @@ resources: - ingress.yaml - pvc.yaml - secrets.yaml + - services.yaml - namespace.yaml patches: @@ -36,5 +37,3 @@ images: newTag: v3.41.1@sha256:1a5bf4b4820a879cdf8d93d7ef0d2d963af56670c9ebff8981860b6804ebc8ab - name: docker.io/qbittorrentofficial/qbittorrent-nox newTag: 5.1.4-2@sha256:85fe2690f418dabffc4907276b3cdffcb7880c7114157b32f932d3b97bac45af - - name: docker.io/slskd/slskd - newTag: 0.25.1 diff --git a/k8s-wheatley/qbittorrent/pvc.yaml b/k8s-wheatley/qbittorrent/pvc.yaml index 4500768..c352b02 100644 --- a/k8s-wheatley/qbittorrent/pvc.yaml +++ b/k8s-wheatley/qbittorrent/pvc.yaml @@ -10,15 +10,3 @@ spec: resources: requests: storage: 5Gi ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: slskd-storage -spec: - storageClassName: piraeus-lvmthin - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi diff --git a/k8s-wheatley/qbittorrent/secrets.yaml b/k8s-wheatley/qbittorrent/secrets.yaml index 15021e4..5e7e3bc 100644 --- a/k8s-wheatley/qbittorrent/secrets.yaml +++ b/k8s-wheatley/qbittorrent/secrets.yaml @@ -17,49 +17,6 @@ spec: remoteRef: key: secrets/managed/qbittorrent/protonvpn-wgconfig property: config - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: slskd-env-secrets -spec: - secretStoreRef: - name: vault-wheatley - kind: ClusterSecretStore - target: - name: slskd-env-secrets - data: - - secretKey: SLSKD_VPN_GLUETUN_API_KEY - remoteRef: - key: secrets/managed/qbittorrent/slskd-env-secrets - property: GLUETUN_API_KEY - - secretKey: SLSKD_SLSK_USERNAME - remoteRef: - key: secrets/managed/qbittorrent/slskd-env-secrets - property: SLSK_USERNAME - - secretKey: SLSKD_SLSK_PASSWORD - remoteRef: - key: secrets/managed/qbittorrent/slskd-env-secrets - property: SLSK_PASSWORD - ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: gluetun-env-secrets -spec: - secretStoreRef: - name: vault-wheatley - kind: ClusterSecretStore - target: - name: gluetun-env-secrets - data: - - secretKey: HTTP_CONTROL_SERVER_AUTH_DEFAULT_ROLE - remoteRef: - key: secrets/managed/qbittorrent/gluetun-env-secrets - property: HTTP_CONTROL_SERVER_AUTH_DEFAULT_ROLE - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/k8s-wheatley/qbittorrent/services.yaml b/k8s-wheatley/qbittorrent/services.yaml new file mode 100644 index 0000000..323409e --- /dev/null +++ b/k8s-wheatley/qbittorrent/services.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: qbittorrent +spec: + selector: + app: qbittorrent + ports: + - port: 80 + protocol: TCP + targetPort: 8112 diff --git a/kustomize-bases/cilium/kustomization.yaml b/kustomize-bases/cilium/kustomization.yaml index f22b922..37b61c4 100644 --- a/kustomize-bases/cilium/kustomization.yaml +++ b/kustomize-bases/cilium/kustomization.yaml @@ -13,5 +13,5 @@ helmCharts: repo: https://helm.cilium.io namespace: kube-system releaseName: cilium - version: 1.19.4 + version: 1.19.3 valuesFile: values.yaml