diff --git a/clusters/cl01tl/platform/qbittorrent/Chart.yaml b/clusters/cl01tl/platform/qbittorrent/Chart.yaml index 9d80f7dd7..6bda90bec 100644 --- a/clusters/cl01tl/platform/qbittorrent/Chart.yaml +++ b/clusters/cl01tl/platform/qbittorrent/Chart.yaml @@ -23,6 +23,6 @@ dependencies: - name: app-template alias: qbittorrent repository: https://bjw-s-labs.github.io/helm-charts/ - version: 3.7.3 + version: 4.0.1 icon: https://cdn.jsdelivr.net/gh/selfhst/icons/png/qbittorrent.png appVersion: 5.1.0 diff --git a/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml b/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml index ec5c95806..101748e50 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/config-map.yaml @@ -4,11 +4,8 @@ metadata: name: glutun-update-script namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: glutun-update-script + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: gluetun - app.kubernetes.io/part-of: {{ .Release.Name }} data: update.sh: | if ! command -v curl 2>&1 >/dev/null diff --git a/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml b/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml index 83f30b097..1f35e6a2a 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/external-secret.yaml @@ -4,11 +4,8 @@ metadata: name: qbittorrent-wireguard-conf namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: qbittorrent-wireguard-conf + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: secretStoreRef: kind: ClusterSecretStore diff --git a/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml b/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml index 99a2a77bf..23d103803 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/http-route.yaml @@ -4,11 +4,8 @@ metadata: name: http-route-qbittorrent namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: http-route-qbittorrent + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: parentRefs: - group: gateway.networking.k8s.io diff --git a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml index 1ffe67f2a..3c2a3bc9d 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume-claim.yaml @@ -4,11 +4,8 @@ metadata: name: qbittorrent-config namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: qbittorrent-config + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} spec: volumeName: qbittorrent-config storageClassName: nfs-client @@ -27,9 +24,6 @@ metadata: labels: app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} spec: volumeName: qbittorrent-nfs-storage storageClassName: nfs-client diff --git a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml index d228daca4..42c62b96d 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/persistent-volume.yaml @@ -4,11 +4,8 @@ metadata: name: qbittorrent-config namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: qbittorrent-config + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} spec: persistentVolumeReclaimPolicy: Retain storageClassName: nfs-client @@ -31,11 +28,8 @@ metadata: name: qbittorrent-nfs-storage namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: qbittorrent-nfs-storage + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} spec: persistentVolumeReclaimPolicy: Retain storageClassName: nfs-client diff --git a/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml b/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml index 2e788707a..062238dd8 100644 --- a/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml +++ b/clusters/cl01tl/platform/qbittorrent/templates/service-monitor.yaml @@ -4,11 +4,8 @@ metadata: name: qbittorrent namespace: {{ .Release.Namespace }} labels: - app.kubernetes.io/name: qbittorrent + app.kubernetes.io/name: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} spec: endpoints: - port: metrics diff --git a/clusters/cl01tl/platform/qbittorrent/values.yaml b/clusters/cl01tl/platform/qbittorrent/values.yaml index 85a066074..e6f84ee68 100644 --- a/clusters/cl01tl/platform/qbittorrent/values.yaml +++ b/clusters/cl01tl/platform/qbittorrent/values.yaml @@ -15,7 +15,7 @@ qbittorrent: privileged: True resources: requests: - cpu: 100m + cpu: 10m memory: 128Mi command: - /bin/sh @@ -103,8 +103,6 @@ qbittorrent: requests: cpu: 10m memory: 64Mi - serviceAccount: - create: true service: main: controller: main