[multiple] Update library (#135)

charts/bazarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.9.0.5
 description: Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements
 name: bazarr
-version: 4.0.0
+version: 4.0.2
 keywords:
   - bazarr
   - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/bazarr/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   media:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /media
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 1.0.5
+version: 1.1.0
 keywords:
   - k8s-at-home
   - common

charts/common/templates/_deployment.tpl

@@ -5,6 +5,13 @@ metadata:
   name: {{ template "common.names.fullname" . }}
   labels:
   {{- include "common.labels" . | nindent 4 }}
+  {{- with .Values.controllerLabels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.controllerAnnotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: 1
   selector:

charts/common/templates/_ingress.tpl

@@ -17,8 +17,8 @@
         {{- if not $ingressValues.nameSuffix -}}
           {{- $_ := set $ingressValues "nameSuffix" $index -}}
         {{ end -}}
-        {{- $_ := set . "ObjectValues" (dict "ingress" $ingressValues) -}}
-        {{- include "common.classes.ingress" . -}}
+        {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}}
+        {{- include "common.classes.ingress" $ -}}
       {{- end }}
     {{- end }}
   {{- end }}

charts/common/templates/_pvc.tpl

@@ -1,15 +1,14 @@
 {{- define "common.pvc" -}}
   {{- /* Generate pvc as required */ -}}
-  {{- $context := . -}}
   {{- range $index, $PVC := .Values.persistence }}
     {{- if and $PVC.enabled (not (or $PVC.emptyDir $PVC.existingClaim)) -}}
       {{- $persistenceValues := $PVC -}}
       {{- if not $persistenceValues.nameSuffix -}}
         {{- $_ := set $persistenceValues "nameSuffix" $index -}}
       {{- end -}}
-      {{- $_ := set $context "ObjectValues" (dict "persistence" $persistenceValues) -}}
+      {{- $_ := set $ "ObjectValues" (dict "persistence" $persistenceValues) -}}
       {{- print ("---") | nindent 0 -}}
-      {{- include "common.classes.pvc" $context -}}
+      {{- include "common.classes.pvc" $ -}}
     {{- end }}
   {{- end }}
 {{- end }}

charts/common/templates/_service.tpl

@@ -1,5 +1,19 @@
 {{- define "common.service" -}}
   {{- if .Values.service.enabled -}}
+    {{- /* Generate primary service */ -}}
     {{- include "common.classes.service" . }}
+
+    {{- /* Generate additional services as required */ -}}
+    {{- range $index, $extraService := .Values.service.additionalServices }}
+      {{- if $extraService.enabled -}}
+        {{- print ("---") | nindent 0 -}}
+        {{- $serviceValues := $extraService -}}
+        {{- if not $serviceValues.nameSuffix -}}
+          {{- $_ := set $serviceValues "nameSuffix" $index -}}
+        {{ end -}}
+        {{- $_ := set $ "ObjectValues" (dict "service" $serviceValues) -}}
+        {{- include "common.classes.service" $ -}}
+      {{- end }}
+    {{- end }}
   {{- end }}
 {{- end }}

charts/common/templates/_statefulset.tpl

@@ -5,6 +5,13 @@ metadata:
   name: {{ template "common.names.fullname" . }}
   labels:
   {{- include "common.labels" . | nindent 4 }}
+  {{- with .Values.controllerLabels }}
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.controllerAnnotations }}
+  annotations:
+  {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   replicas: 1
   selector:

charts/common/templates/addons/vpn/_volume.tpl

@@ -2,12 +2,12 @@
 The OpenVPN shared volume to be inserted
 */}}
 {{- define "common.addon.vpn.volume" -}}
-{{- if or .Values.addons.vpn.vpnConf .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
+{{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down -}}
 name: vpnconfig
 configMap:
   name: {{ template "common.names.fullname" . }}-vpn
   items:
-    {{- if .Values.addons.vpn.vpnConf }}
+    {{- if .Values.addons.vpn.configFile }}
     - key: vpnConfigfile
       path: vpnConfigfile
     {{- end }}

charts/common/templates/classes/_service.tpl

@@ -5,11 +5,15 @@
     {{- $values = . -}}
   {{- end -}}
 {{ end -}}
+{{- $serviceName := include "common.names.fullname" . -}}
+{{- if hasKey $values "nameSuffix" -}}
+  {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}}
+{{ end -}}
 {{- $svcType := $values.type -}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "common.names.fullname" . }}
+  name: {{ $serviceName }}
   labels:
     {{- include "common.labels" . | nindent 4 }}
   {{- if $values.labels }}

charts/common/values.yaml

@@ -1,5 +1,12 @@
 # type: options are statefulset or deployment
 controllerType: deployment
+# Set annotations on the deployment/statefulset
+controllerAnnotations: {}
+# Set labels on the deployment/statefulset
+controllerLabels: {}
+
+# Set annotations on the pod
+podAnnotations: {}
 
 env: {}
 
@@ -47,6 +54,21 @@ service:
   annotations: {}
   labels: {}
 
+  additionalServices: []
+  # - enabled: false
+  #   nameSuffix: api
+  #   type: ClusterIP
+  #   # Specify the default port information
+  #   port:
+  #     port: ""
+  #     name: http
+  #     protocol: TCP
+  #     targetPort: http
+  #     # nodePort:
+  #   additionalPorts: []
+  #   annotations: {}
+  #   labels: {}
+
 ingress:
   enabled: false
   annotations: {}

charts/jackett/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.16.2106
 description: API Support for your favorite torrent trackers
 name: jackett
-version: 5.0.2
+version: 5.0.4
 keywords:
   - jackett
   - torrent
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/jackett/README.md

@@ -35,7 +35,7 @@ Additionally you can take a look at the common library [values.yaml](https://git
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 ```console
 helm install jackett \
-  --set jackett.env.TZ="America/New York" \
+  --set env.TZ="America/New York" \
     k8s-at-home/jackett
 ```
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the

charts/jackett/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   torrentblackhole:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /downloads
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/lidarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.8.0.1886
 description: Looks and smells like Sonarr but made for music
 name: lidarr
-version: 5.0.0
+version: 5.0.2
 keywords:
   - lidarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/lidarr/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   media:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /media
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/nzbget/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v21.0
 description: NZBGet is a Usenet downloader client
 name: nzbget
-version: 5.0.1
+version: 6.0.1
 keywords:
   - nzbget
   - usenet
@@ -15,7 +15,6 @@ maintainers:
   - name: billimek
     email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.0
-    alias: nzbget
+    version: ^1.1.0

charts/nzbget/README.md

@@ -1,6 +1,6 @@
-# NZBGet Usenet client
+# NZBGet
 
-This is a helm chart for [NZBGet](https://nzbget.net/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/nzbget/)
+This is a helm chart for [NZBGet](https://nzbget.net/).
 
 ## TL;DR;
 
@@ -33,13 +33,14 @@ helm delete my-release --purge
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-Read through the media-common [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/media-common/values.yaml)
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/nzbget/values.yaml)
 file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 ```console
 helm install nzbget \
-  --set radarr.env.TZ="America/New York" \
+  --set env.TZ="America/New York" \
     k8s-at-home/nzbget
 ```
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
@@ -50,9 +51,8 @@ helm install radarr k8s-at-home/nzbget --values values.yaml
 
 These values will be nested as it is a dependency, for example
 ```yaml
-nzbget:
-  image:
-    tag: ...
+image:
+  tag: ...
 ```
 
 ---
@@ -65,3 +65,18 @@ Error: rendered manifests contain a resource that already exists. Unable to cont
 it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 5.x.x to 6.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

charts/nzbget/ci/ct-values.yaml

@@ -1,10 +1,2 @@
-nzbget:
-  image:
-    organization: linuxserver
-    repository: nzbget
-    tag: latest
-  service:
-    type: ClusterIP
-    port: 6789
-  ingress:
-    enabled: false
+ingress:
+  enabled: true

charts/nzbget/templates/NOTES.txt

@@ -1,23 +1 @@
-{{- $svcPort := .Values.nzbget.service.port -}}
-1. Get the application URL by running these commands:
-{{- if .Values.nzbget.ingress.enabled }}
-{{- range .Values.nzbget.ingress.hosts }}
-  http{{ if $.Values.nzbget.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.nzbget.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.nzbget.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "media-common.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.nzbget.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "media-common.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "media-common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ $svcPort }}
-{{- else if contains "ClusterIP" .Values.nzbget.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "media-common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ $svcPort }}
-{{- end }}
-
-The default login to the GUI is login:nzbget, password:tegbzn6789
-You should change this as soon as possible!
+{{- include "common.notes.defaultNotes" . -}}

charts/nzbget/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/nzbget/templates/pvc.yaml

@@ -1,22 +0,0 @@
-{{- if and .Values.nzbget.persistence.downloads.enabled (not .Values.nzbget.persistence.downloads.existingClaim) }}
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "media-common.fullname" . }}-downloads
-  {{- if .Values.nzbget.persistence.downloads.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-  {{- include "media-common.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.nzbget.persistence.downloads.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.nzbget.persistence.downloads.size | quote }}
-  {{- if .Values.nzbget.persistence.downloads.storageClass }}
-  storageClassName: {{ if (eq "-" .Values.nzbget.persistence.downloads.storageClass) }}""{{- else }}{{ .Values.nzbget.persistence.downloads.storageClass | quote}}{{- end }}
-  {{- end }}
-{{- end -}}

charts/nzbget/values.yaml

@@ -1,40 +1,49 @@
 # Default values for nzbget.
 
-nzbget:
-  image:
-    organization: linuxserver
-    repository: nzbget
-    pullPolicy: IfNotPresent
-    tag: v21.0-ls61
-  service:
+image:
+  repository: linuxserver/nzbget
+  pullPolicy: IfNotPresent
+  tag: version-v21.0
+
+service:
+  port:
     port: 6789
 
-  # Configure the OpenVPN add-on
-  openvpn:
+persistence:
+  config:
     enabled: false
+    emptyDir: false
 
-  persistence:
-    downloads:
-      enabled: false
-      ## nzbget downloads Persistent Volume Storage Class
-      ## If defined, storageClassName: <storageClass>
-      ## If set to "-", storageClassName: "", which disables dynamic provisioning
-      ## If undefined (the default) or set to null, no storageClassName spec is
-      ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-      ##   GKE, AWS & OpenStack)
-      # storageClass: "-"
-      # accessMode: ReadWriteOnce
-      # size: 1Gi
-      ## Do not delete the pvc upon helm uninstall
-      # skipuninstall: false
+  media:
+    enabled: false
+    emptyDir: false
+    mountPath: /media
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
 
-  additionalVolumes:
-    - name: downloads
-      emptyDir: {}
-      ## When using persistence.downloads.enabled: true, adjust this to:
-      # persistentVolumeClaim:
-      #   claimName: nzbget-downloads
-
-  additionalVolumeMounts:
-    - name: downloads
-      mountPath: /downloads
+  downloads:
+    enabled: false
+    emptyDir: false
+    mountPath: /downloads
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""

charts/nzbhydra2/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v3.4.3
 description: Usenet meta search
 name: nzbhydra2
-version: 4.0.0
+version: 4.0.2
 keywords:
   - nzbhydra2
   - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/nzbhydra2/values.yaml

@@ -16,5 +16,5 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false

charts/ombi/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.0.681
 description: Want a Movie or TV Show on Plex or Emby? Use Ombi!
 name: ombi
-version: 5.0.0
+version: 5.0.2
 keywords:
   - ombi
   - plex
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/ombi/values.yaml

@@ -16,5 +16,5 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false

charts/organizr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: latest
 description: HTPC/Homelab Services Organizer
 name: organizr
-version: 2.0.0
+version: 2.0.2
 keywords:
   - organizr
 home: https://github.com/k8s-at-home/charts/tree/master/charts/organizr
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/organizr/values.yaml

@@ -16,5 +16,5 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false

charts/qbittorrent/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 4.2.5
+appVersion: 4.3.0
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
 name: qbittorrent
-version: 5.0.1
+version: 6.0.1
 keywords:
   - qbittorrent
   - torrrent
@@ -14,7 +14,6 @@ maintainers:
   - name: billimek
     email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.0
-    alias: qbittorrent
+    version: ^1.1.0

charts/qbittorrent/README.md

@@ -1,6 +1,6 @@
-# qBittorrent client
+# qBittorrent
 
-This is a helm chart for [qbittorrent](https://qbittorrent.org/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/qbittorrent/)
+This is a helm chart for [qbittorrent](https://qbittorrent.org/).
 
 ## TL;DR;
 
@@ -32,27 +32,25 @@ helm delete my-release --purge
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
-## Configuration
-Read through the media-common [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/media-common/values.yaml)
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/qbittorrent/values.yaml)
 file. It has several commented out suggested values.
+Additionally you can take a look at the common library [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/common/values.yaml) for more (advanced) configuration options.
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 ```console
-helm install qbittorrent \
-  --set qbittorrent.env.TZ="America/New York" \
+helm install my-release \
+  --set env.TZ="America/New York" \
     k8s-at-home/qbittorrent
 ```
 Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
 chart. For example,
 ```console
-helm install qbittorrent k8s-at-home/qbittorrent --values values.yaml 
+helm install my-release k8s-at-home/qbittorrent --values values.yaml 
 ```
 
-These values will be nested as it is a dependency, for example
 ```yaml
-qbittorrent:
-  image:
-    tag: ...
+image:
+  tag: ...
 ```
 
 ---
@@ -65,3 +63,18 @@ Error: rendered manifests contain a resource that already exists. Unable to cont
 it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
+
+## Upgrading an existing Release to a new major version
+
+A major chart version change (like 4.0.1 -> 5.0.0) indicates that there is an incompatible breaking change potentially needing manual actions.
+
+### Upgrading from 5.x.x to 6.x.x
+
+Due to migrating to a centralized common library some values in `values.yaml` have changed.
+
+Examples:
+
+* `service.port` has been moved to `service.port.port`.
+* `persistence.type` has been moved to `controllerType`.
+
+Refer to the library values.yaml for more configuration options.

charts/qbittorrent/ci/ct-values.yaml

@@ -1,12 +1,2 @@
-qbittorrent:
-  image:
-    organization: linuxserver
-    repository: qbittorrent
-    tag: 14.2.5.99202004250119-7015-2c65b79ubuntu18.04.1-ls91
-
-  service:
-    type: ClusterIP
-    port: 8080
-
-  ingress:
-    enabled: false
+ingress:
+  enabled: true

charts/qbittorrent/templates/NOTES.txt

@@ -1,23 +1 @@
-{{- $svcPort := .Values.qbittorrent.service.port -}}
-1. Get the application URL by running these commands:
-{{- if .Values.qbittorrent.ingress.enabled }}
-{{- range .Values.qbittorrent.ingress.hosts }}
-  http{{ if $.Values.qbittorrent.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.qbittorrent.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.qbittorrent.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "media-common.fullname" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.qbittorrent.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "media-common.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "media-common.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ $svcPort }}
-{{- else if contains "ClusterIP" .Values.qbittorrent.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "media-common.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ $svcPort }}
-{{- end }}
-
-The default login to the GUI is login:admin, password:adminadmin
-You should change this as soon as possible!
+{{- include "common.notes.defaultNotes" . -}}

charts/qbittorrent/templates/common.yaml

@@ -0,0 +1 @@
+{{ include "common.all" . }}

charts/qbittorrent/templates/configmap.yaml

@@ -1,15 +1,22 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "media-common.fullname" . }}-scripts
+  name: {{ template "common.names.fullname" . }}-scripts
   labels:
-  {{- include "media-common.labels" . | nindent 4 }}
+    {{- include "common.labels" . | nindent 4 }}
 data:
-  {{- if and .Values.qbittorrent.btService .Values.qbittorrent.btService.port }}
+  {{- /* Determine if the bittorrent port is set somewhere */ -}}
+  {{- $bittorrentPort := "" -}}
+  {{- range $extraServices := .Values.service.additionalServices }}
+    {{- if and .enabled (eq "bittorrent" .nameSuffix) -}}
+      {{- $bittorrentPort = .port.port -}}
+    {{- end }}
+  {{- end }}
+  {{- if $bittorrentPort }}
   31-update-port: |-
     #!/bin/bash
     QBITTORRENT_CONFIGFILE="/config/qBittorrent/qBittorrent.conf"
-    INCOMING_PORT={{- .Values.qbittorrent.btService.port }}
+    INCOMING_PORT={{- $bittorrentPort }}
 
     incoming_port_exist=$(cat ${QBITTORRENT_CONFIGFILE} | grep -m 1 'Connection\\PortRangeMin='${INCOMING_PORT})
     if [[ -z "${incoming_port_exist}" ]]; then

charts/qbittorrent/templates/pvc.yaml

@@ -1,22 +0,0 @@
-{{- if and .Values.qbittorrent.persistence.downloads.enabled (not .Values.qbittorrent.persistence.downloads.existingClaim) }}
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "media-common.fullname" . }}-downloads
-  {{- if .Values.qbittorrent.persistence.downloads.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-  {{- include "media-common.labels" . | nindent 4 }}
-spec:
-  accessModes:
-    - {{ .Values.qbittorrent.persistence.downloads.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.qbittorrent.persistence.downloads.size | quote }}
-  {{- if .Values.qbittorrent.persistence.downloads.storageClass }}
-  storageClassName: {{ if (eq "-" .Values.qbittorrent.persistence.downloads.storageClass) }}""{{- else }}{{ .Values.qbittorrent.persistence.downloads.storageClass | quote}}{{- end }}
-  {{- end }}
-{{- end -}}

charts/qbittorrent/templates/service.yaml

@@ -1,28 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "media-common.fullname" . }}-bittorrent
-  labels:
-  {{- include "media-common.labels" . | nindent 4 }}
-  {{- if .Values.qbittorrent.btService.labels }}
-  {{ toYaml .Values.qbittorrent.btService.labels | indent 4 }}
-  {{- end }}
-  {{- with .Values.qbittorrent.btService.annotations }}
-  annotations:
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
-spec:
-  type: {{ .Values.qbittorrent.btService.type }}
-  ports:
-    - name: bittorrent
-      port: {{ .Values.qbittorrent.btService.port }}
-      protocol: TCP
-      targetPort: {{ .Values.qbittorrent.btService.port }}
-      {{- if (and (eq .Values.qbittorrent.btService.type "NodePort") (not (empty .Values.qbittorrent.btService.nodePort))) }}
-      nodePort: {{ .Values.qbittorrent.btService.nodePort }}
-      {{- end }}
-  {{- with .Values.qbittorrent.btService.additionalSpec }}
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-  selector:
-  {{- include "media-common.selectorLabels" . | nindent 4 }}

charts/qbittorrent/values.yaml

@@ -1,66 +1,77 @@
 # Default values for qbittorrent.
 
-qbittorrent:
-  image:
-    organization: linuxserver
-    repository: qbittorrent
-    pullPolicy: IfNotPresent
-    tag: 14.2.5.99202004250119-7015-2c65b79ubuntu18.04.1-ls91
+image:
+  repository: linuxserver/qbittorrent
+  pullPolicy: IfNotPresent
+  tag: version-4.3.0202010181232-7086-1c663adeeubuntu18.04.1
 
-  env:
-    TZ: UTC
-    PUID: "1001"
-    PGID: "1001"
-    UMASK: "022"
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
+  # UMASK: 022
 
-  service:
+service:
+  port:
     port: 8080
 
-  btService:
+  additionalServices:
+  - enabled: true
+    nameSuffix: bittorrent
     type: ClusterIP
-    port: 6881
-    ## Specify the nodePort value for the LoadBalancer and NodePort service types.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
-    ##
-    # nodePort:
-    ## Provide any additional annotations which may be required. This can be used to
-    ## set the LoadBalancer service type to internal only.
-    ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#internal-load-balancer
-    ##
-    annotations: {}
-    labels: {}
-    additionalSpec: {}
+    port:
+      port: 6881
+      name: bittorrent
+      protocol: TCP
+      targetPort: 6881
 
-  persistence:
-    downloads:
-      enabled: false
-      ## qbittorrent downloads Persistent Volume Storage Class
-      ## If defined, storageClassName: <storageClass>
-      ## If set to "-", storageClassName: "", which disables dynamic provisioning
-      ## If undefined (the default) or set to null, no storageClassName spec is
-      ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
-      ##   GKE, AWS & OpenStack)
-      # storageClass: "-"
-      # accessMode: ReadWriteOnce
-      # size: 1Gi
-      ## Do not delete the pvc upon helm uninstall
-      # skipuninstall: false
+persistence:
+  config:
+    enabled: false
+    emptyDir: false
 
-  additionalVolumes:
-    - name: qbittorrent-scripts
-      emptyDir: {}
-      ## When you want to enable automatic port configuration at startup, adjust this to:
-      # configMap:
-      #   name: <RELEASENAME>-scripts
-      #   defaultMode: 511
-    - name: downloads
-      emptyDir: {}
-      ## When using persistence.downloads.enabled: true, adjust this to:
-      # persistentVolumeClaim:
-      #   claimName: qbittorrent-downloads
+  media:
+    enabled: false
+    emptyDir: false
+    mountPath: /media
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
 
-  additionalVolumeMounts:
-    - mountPath: /config/custom-cont-init.d
-      name: qbittorrent-scripts
-    - name: downloads
-      mountPath: /downloads
+  downloads:
+    enabled: false
+    emptyDir: false
+    mountPath: /downloads
+    ## Persistent Volume Storage Class
+    ## If defined, storageClassName: <storageClass>
+    ## If set to "-", storageClassName: "", which disables dynamic provisioning
+    ## If undefined (the default) or set to null, no storageClassName spec is
+    ##   set, choosing the default provisioner.  (gp2 on AWS, standard on
+    ##   GKE, AWS & OpenStack)
+    # storageClass: "-"
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
+    ## Do not delete the pvc upon helm uninstall
+    # skipuninstall: false
+    # existingClaim: ""
+
+additionalVolumes:
+  - name: qbittorrent-scripts
+    emptyDir: {}
+    ## When you want to enable automatic port configuration at startup, adjust this to:
+    # configMap:
+    #   name: <RELEASENAME>-scripts
+    #   defaultMode: 511
+
+additionalVolumeMounts:
+  - mountPath: /config/custom-cont-init.d
+    name: qbittorrent-scripts

charts/radarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.0.3989
 description: A fork of Sonarr to work with movies à la Couchpotato
 name: radarr
-version: 7.0.0
+version: 7.0.2
 keywords:
   - radarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/radarr/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   media:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /media
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/sabnzbd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.1.0
 description: Free and easy binary newsreader
 name: sabnzbd
-version: 3.0.0
+version: 3.0.2
 keywords:
   - sabnzbd
   - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/sabnzbd/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   media:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /media
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>
@@ -37,8 +37,8 @@ persistence:
     # existingClaim: ""
 
   downloads:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /downloads
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/sonarr/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 3.0.4.993
 description: Smart PVR for newsgroup and bittorrent users
 name: sonarr
-version: 7.0.1
+version: 7.0.3
 keywords:
   - sonarr
   - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/sonarr/values.yaml

@@ -16,12 +16,12 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
 
   media:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false
     mountPath: /media
     ## Persistent Volume Storage Class
     ## If defined, storageClassName: <storageClass>

charts/tautulli/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v2.6.1
 description: A Python based monitoring and tracking tool for Plex Media Server
 name: tautulli
-version: 5.0.0
+version: 5.0.2
 keywords:
   - tautulli
   - plex
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.4
+    version: ^1.1.0

charts/tautulli/values.yaml

@@ -16,5 +16,5 @@ env: {}
 
 persistence:
   config:
-    enabled: true
-    emptyDir: true
+    enabled: false
+    emptyDir: false