[common] Indenting and fix volume logic (#130)

* sabnzbd: use common chart

* remove app name in app.env example

charts/bazarr/Chart.yaml

@@ -1,15 +1,15 @@
 apiVersion: v2
-appVersion: v0.9.0.2
+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: 3.1.0
+version: 4.0.0
 keywords:
   - bazarr
   - radarr
   - sonarr
   - subtitles
   - usenet
-  - bittorrent
+  - torrent
 home: https://github.com/k8s-at-home/charts/tree/master/charts/bazarr
 icon: https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/bazarr.png
 sources:
@@ -18,3 +18,7 @@ sources:
 maintainers:
   - name: billimek
     email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: ^1.0.4

charts/bazarr/OWNERS

@@ -1,4 +1,4 @@
 approvers:
 - billimek
 reviewers:
-- billimek
+- billimek

charts/bazarr/README.md

@@ -1,6 +1,6 @@
-# bazarr subtitle download client
+# Bazarr
 
-This is a helm chart for [bazarr](https://github.com/morpheus65535/bazarr) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/bazarr)
+This is a helm chart for [Bazarr](https://github.com/morpheus65535/bazarr).
 
 ## TL;DR;
 
@@ -17,20 +17,6 @@ To install the chart with the release name `my-release`:
 helm install --name my-release k8s-at-home/bazarr
 ```
 
-## Upgrading
-
-Version 1.0.0 used separate PVCs for TV and Movies. In order to keep this chart inline
-with changes to charts for Sonarr, etc. this was changed.
-
-This chart now uses a single PVC for all media. This means all of your media must be in, or be subdirectories of, a single media directory. If upgrading from v1 of the chart, do the following:
-
-1. [Uninstall](#uninstalling-the-chart) your current release
-2. On your backing store, organize your media, ie. media/tv, media/movies
-3. If using a pre-existing PVC, create a single new PVC for all of your media
-4. Refer to the [configuration](#configuration) for updates to the chart values
-5. Re-install the chart
-6. Update your settings in the app to point to the new PVC, which is mounted at /media. These can be found at: `Settings -> Path Mappings For TV Shows` and `Settings -> Path Mappings for Movies`
-
 ## Uninstalling the Chart
 
 To uninstall/delete the `my-release` deployment:
@@ -42,77 +28,49 @@ helm delete my-release --purge
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                              | Description                                                                                  | Default               |
-| -------------------------------------- | -------------------------------------------------------------------------------------------- | --------------------- |
-| `image.repository`                     | Image repository                                                                             | `linuxserver/bazarr`  |
-| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/bazarr/tags/). | `v0.8.4.2-ls72`       |
-| `image.pullPolicy`                     | Image pull policy                                                                            | `IfNotPresent`        |
-| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                  | `Recreate`            |
-| `timezone`                             | Timezone the bazarr instance should run as, e.g. 'America/New_York'                          | `UTC`                 |
-| `puid`                                 | process userID the bazarr instance should run as                                             | `1001`                |
-| `pgid`                                 | process groupID the bazarr instance should run as                                            | `1001`                |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                          | `60`                  |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                             | `5`                   |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                               | `10`                  |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                         | `60`                  |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                            | `5`                   |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                              | `10`                  |
-| `Service.type`                         | Kubernetes service type for the bazarr GUI                                                   | `ClusterIP`           |
-| `Service.port`                         | Kubernetes port where the bazarr GUI is exposed                                              | `6767`                |
-| `Service.annotations`                  | Service annotations for the bazarr GUI                                                       | `{}`                  |
-| `Service.labels`                       | Custom labels                                                                                | `{}`                  |
-| `Service.loadBalancerIP`               | Loadbalance IP for the bazarr GUI                                                            | `{}`                  |
-| `Service.loadBalancerSourceRanges`     | List of IP CIDRs allowed access to load balancer (if supported)                              | None                  |
-| `ingress.enabled`                      | Enables Ingress                                                                              | `false`               |
-| `ingress.annotations`                  | Ingress annotations                                                                          | `{}`                  |
-| `ingress.labels`                       | Custom labels                                                                                | `{}`                  |
-| `ingress.path`                         | Ingress path                                                                                 | `/`                   |
-| `ingress.hosts`                        | Ingress accepted hostnames                                                                   | `chart-example.local` |
-| `ingress.tls`                          | Ingress TLS configuration                                                                    | `[]`                  |
-| `persistence.config.enabled`           | Use persistent volume to store configuration data                                            | `true`                |
-| `persistence.config.size`              | Size of persistent volume claim                                                              | `1Gi`                 |
-| `persistence.config.existingClaim`     | Use an existing PVC to persist data                                                          | `nil`                 |
-| `persistence.config.subpath`           | Select a subpath in the PVC                                                          | `nil`                 |
-| `persistence.config.storageClass`      | Type of persistent volume claim                                                              | `-`                   |
-| `persistence.config.accessMode`        | Persistence access mode                                                                      | `ReadWriteOnce`       |
-| `persistence.config.skipuninstall`     | Do not delete the pvc upon helm uninstall                                                    | `false`               |
-| `persistence.media.enabled`            | Use persistent volume to store media data                                                    | `true`                |
-| `persistence.media.size`               | Size of persistent volume claim                                                              | `10Gi`                |
-| `persistence.media.existingClaim`      | Use an existing PVC to persist data                                                          | `nil`                 |
-| `persistence.media.storageClass`       | Type of persistent volume claim                                                              | `-`                   |
-| `persistence.media.accessMode`         | Persistence access mode                                                                      | `ReadWriteOnce`       |
-| `persistence.media.skipuninstall`      | Do not delete the pvc upon helm uninstall                                                    | `false`               |
-| `persistence.extraExistingClaimMounts`      | Optionally add multiple existing claims                                                      | `[]`                                           |
-| `resources`                            | CPU/Memory resource requests/limits                                                          | `{}`                  |
-| `nodeSelector`                         | Node labels for pod assignment                                                               | `{}`                  |
-| `tolerations`                          | Toleration labels for pod assignment                                                         | `[]`                  |
-| `affinity`                             | Affinity settings for pod assignment                                                         | `{}`                  |
-| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                    | `{}`                  |
-| `deploymentAnnotations`                | Key-value pairs to add as deployment annotations                                             | `{}`                  |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bazarr/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 --name my-release \
-  --set timezone="America/New York" \
+helm install bazarr \
+  --set env.TZ="America/New York" \
     k8s-at-home/bazarr
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
-helm install --name my-release -f values.yaml stable/bazarr
+helm install bazarr k8s-at-home/bazarr --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
 ```
 
 ---
-
 **NOTE**
 
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
 
-Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/bazarr/values.yaml) file. It has several commented out suggested values.
+## 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 3.x.x to 4.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/bazarr/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/bazarr/templates/NOTES.txt

@@ -1,19 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "bazarr.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.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 "bazarr.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "bazarr.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "bazarr.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:80
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/bazarr/templates/_helpers.tpl

@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "bazarr.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "bazarr.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "bazarr.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/bazarr/templates/common.yaml

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

charts/bazarr/templates/config-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "bazarr.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/bazarr/templates/deployment.yaml

@@ -1,113 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "bazarr.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "bazarr.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "bazarr.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 6767
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-          readinessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-          env:
-            - name: TZ
-              value: "{{ .Values.timezone }}"
-            - name: PUID
-              value: "{{ .Values.puid }}"
-            - name: PGID
-              value: "{{ .Values.pgid }}"
-          volumeMounts:
-            - mountPath: /config
-              name: config
-            {{- if .Values.persistence.config.subPath }}
-              subPath: {{ .Values.persistence.config.subPath }}
-            {{- end }}
-            - mountPath: /media
-              name: media
-            {{- if .Values.persistence.media.subPath }}
-              subPath: {{ .Values.persistence.media.subPath }}
-            {{- end }}
-            {{- range .Values.persistence.extraExistingClaimMounts }}
-            - name: {{ .name }}
-              mountPath: {{ .mountPath }}
-              readOnly: {{ .readOnly }}
-            {{- end }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.config.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "bazarr.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      - name: media
-      {{- if .Values.persistence.media.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.media.existingClaim }}{{ .Values.persistence.media.existingClaim }}{{- else }}{{ template "bazarr.fullname" . }}-media{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
-      {{- range .Values.persistence.extraExistingClaimMounts }}
-      - name: {{ .name }}
-        persistentVolumeClaim:
-          claimName: {{ .existingClaim }}
-      {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}

charts/bazarr/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "bazarr.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    {{- with .Values.ingress.labels -}}
-    {{ toYaml . | nindent 4 }}
-    {{- end -}}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}

charts/bazarr/templates/media-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.media.enabled (not .Values.persistence.media.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "bazarr.fullname" . }}-media
-  {{- if .Values.persistence.media.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.media.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.media.size | quote }}
-{{- if .Values.persistence.media.storageClass }}
-{{- if (eq "-" .Values.persistence.media.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.media.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/bazarr/templates/service.yaml

@@ -1,52 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "bazarr.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    helm.sh/chart: {{ include "bazarr.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "bazarr.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}

charts/bazarr/values.yaml

@@ -1,133 +1,37 @@
-# Default values for bazarr.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+# Default values for Bazarr.
 
 image:
   repository: linuxserver/bazarr
-  tag: v0.9.0.2-ls89
   pullPolicy: IfNotPresent
-
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
+  tag: version-v0.9.0.5
 
 service:
-  type: ClusterIP
-  port: 6767
-  ## 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: {}
-  ## Use loadBalancerIP to request a specific static IP,
-  ## otherwise leave blank
-  ##
-  loadBalancerIP:
-  # loadBalancerSourceRanges: []
-  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-  # externalTrafficPolicy: Cluster
+  port:
+    port: 6767
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  labels: {}
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
 
 persistence:
   config:
     enabled: true
-    ## bazarr configuration data 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: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 1Gi
-    ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
+    emptyDir: true
+
   media:
     enabled: true
-    ## bazarr media volume configuration
+    emptyDir: true
+    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: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
     ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  extraExistingClaimMounts: []
-    # - name: external-mount
-    #   mountPath: /srv/external-mount
-    ## A manually managed Persistent Volume and Claim
-    ## If defined, PVC must be created manually before volume will be bound
-    #   existingClaim:
-    #   readOnly: true
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-deploymentAnnotations: {}
+    # skipuninstall: false
+    # existingClaim: ""

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.4
+version: 1.0.5
 keywords:
   - k8s-at-home
   - common

charts/common/templates/_deployment.tpl

@@ -38,7 +38,7 @@ spec:
       {{- end }}
 
       volumes:
-      {{- include "common.controller.volumes" . | nindent 6 }}
+      {{- include "common.controller.volumes" . | trim | nindent 6 }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector:

charts/common/templates/_statefulset.tpl

@@ -39,7 +39,7 @@ spec:
       {{- end }}
 
       volumes:
-      {{- include "common.controller.volumes" . | nindent 6 }}
+      {{- include "common.controller.volumes" . | trim | nindent 6 }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector:

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

@@ -10,17 +10,17 @@ metadata:
   labels:
   {{- include "common.labels" . | nindent 4 }}
 data:
-{{- if .Values.addons.vpn.configFile }}
+{{- with .Values.addons.vpn.configFile }}
   vpnConfigfile: |-
-    {{- .Values.addons.vpn.configFile | nindent 4}}
+    {{- . | nindent 4}}
 {{- end }}
-{{- if .Values.addons.vpn.scripts.up }}
+{{- with .Values.addons.vpn.scripts.up }}
   up.sh: |-
-    {{- .Values.addons.vpn.scripts.up | nindent 4}}
+    {{- . | nindent 4}}
 {{- end }}
-{{- if .Values.addons.vpn.scripts.down }}
+{{- with .Values.addons.vpn.scripts.down }}
   down.sh: |-
-    {{- .Values.addons.vpn.scripts.down | nindent 4}}
+    {{- . | nindent 4}}
 {{- end }}
 {{- end -}}
 {{- end -}}

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

@@ -14,8 +14,8 @@ spec:
   policyTypes:
     - Egress
   egress:
-  {{- if .Values.addons.vpn.networkPolicy.egress }} 
-    {{- .Values.addons.vpn.networkPolicy.egress | toYaml | nindent 4 }}
+  {{- with .Values.addons.vpn.networkPolicy.egress }} 
+    {{- . | toYaml | nindent 4 }}
   {{- end -}}
 {{- end -}}
 {{- end -}}

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

@@ -15,7 +15,7 @@ Template to render VPN addon
   {{- $configmap := include "common.addon.vpn.configmap" . -}}
   {{- if $configmap -}}
     {{- print "---" | nindent 0 -}}
-    {{- $configmap -}}
+    {{- $configmap | nindent 0 -}}
   {{- end -}}
 
   {{/* Append the vpn config volume to the additionalVolumes */}}
@@ -29,7 +29,7 @@ Template to render VPN addon
   {{- $networkpolicy := include "common.addon.vpn.networkpolicy" . -}}
   {{- if $networkpolicy -}}
     {{- print "---" | nindent 0 -}}
-    {{- $networkpolicy -}}
+    {{- $networkpolicy | nindent 0 -}}
   {{- end -}}
 {{- end -}}
 {{- end -}}

charts/common/templates/addons/vpn/openvpn/_addon.tpl

@@ -5,7 +5,7 @@ Template to render OpenVPN addon
   {{/* Append the openVPN container to the additionalContainers */}}
   {{- $container := include "common.addon.openvpn.container" . | fromYaml -}}
   {{- if $container -}}
-    {{- $additionalContainers := append .Values.additionalContainers $container }}
+    {{- $additionalContainers := append .Values.additionalContainers $container -}}
     {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
   {{- end -}}
 
@@ -13,6 +13,6 @@ Template to render OpenVPN addon
   {{- $secret := include "common.addon.openvpn.secret" . -}}
   {{- if $secret -}}
     {{- print "---" | nindent 0 -}}
-    {{- $secret -}}
+    {{- $secret | nindent 0 -}}
   {{- end -}}
 {{- end -}}

charts/common/templates/addons/vpn/openvpn/_container.tpl

@@ -9,9 +9,9 @@ securityContext:
   capabilities:
     add: 
       - NET_ADMIN
-{{- if .Values.addons.vpn.env }}
+{{- with .Values.addons.vpn.env }}
 env:
-{{- range $k, $v := .Values.addons.vpn.env }}
+{{- range $k, $v := . }}
   - name: {{ $k }}
     value: {{ $v }}
 {{- end }}
@@ -43,15 +43,19 @@ volumeMounts:
     subPath: down.sh
 {{- end }}
 {{- if .Values.persistence.shared.enabled }}
-- mountPath: {{ .Values.persistence.shared.mountPath }}
-  name: shared
+  - mountPath: {{ .Values.persistence.shared.mountPath }}
+    name: shared
 {{- end }}
-{{- if .Values.addons.vpn.additionalVolumeMounts }}
-  {{- toYaml .Values.addons.vpn.additionalVolumeMounts | nindent 2 }}
+{{- with .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml . | nindent 2 }}
 {{- end }}
 {{- end }}
-{{- if .Values.addons.vpn.livenessProbe }}
+{{- with .Values.addons.vpn.livenessProbe }}
 livenessProbe:
-  {{- toYaml .Values.addons.vpn.livenessProbe | nindent 4 }}
+  {{- toYaml . | nindent 4 }}
 {{- end -}}
+{{- with .Values.addons.vpn.resources }}
+resources:
+  {{- toYaml . | nindent 4 }}
+{{- end }}
 {{- end -}}

charts/common/templates/addons/vpn/openvpn/_secret.tpl

@@ -2,14 +2,14 @@
 The OpenVPN secrets to be included
 */}}
 {{- define "common.addon.openvpn.secret" -}}
-{{- if .Values.addons.vpn.openvpn.auth -}}
+{{- with .Values.addons.vpn.openvpn.auth -}}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "common.names.fullname" . }}-openvpn
+  name: {{ template "common.names.fullname" $ }}-openvpn
   labels:
-  {{- include "common.labels" . | nindent 4 }}
+  {{- include "common.labels" $ | nindent 4 }}
 data:
-  VPN_AUTH: {{ .Values.addons.vpn.openvpn.auth | b64enc }}
+  VPN_AUTH: {{ . | b64enc }}
 {{- end -}}
 {{- end -}}

charts/common/templates/addons/vpn/wireguard/_addon.tpl

@@ -5,7 +5,7 @@ Template to render Wireguard addon
   {{/* Append the Wireguard container to the additionalContainers */}}
   {{- $container := include "common.addon.wireguard.container" . | fromYaml -}}
   {{- if $container -}}
-    {{- $additionalContainers := append .Values.additionalContainers $container }}
+    {{- $additionalContainers := append .Values.additionalContainers $container -}}
     {{- $_ := set .Values "additionalContainers" $additionalContainers -}}
   {{- end -}}
 {{- end -}}

charts/common/templates/addons/vpn/wireguard/_container.tpl

@@ -11,13 +11,13 @@ securityContext:
     add: 
       - NET_ADMIN
       - SYS_MODULE
-{{- if .Values.addons.vpn.env }}
+{{- with .Values.addons.vpn.env }}
 env:
-{{- range $k, $v := .Values.addons.vpn.env }}
+{{- range $k, $v := . }}
   - name: {{ $k }}
     value: {{ $v }}
 {{- end }}
-{{- end }}  
+{{- end }}
 {{- if or .Values.addons.vpn.configFile .Values.addons.vpn.scripts.up .Values.addons.vpn.scripts.down .Values.addons.vpn.additionalVolumeMounts .Values.persistence.shared.enabled }}
 volumeMounts:
 {{- if .Values.addons.vpn.configFile }}
@@ -36,15 +36,19 @@ volumeMounts:
     subPath: down.sh
 {{- end }}
 {{- if .Values.persistence.shared.enabled }}
-- mountPath: {{ .Values.persistence.shared.mountPath }}
-  name: shared
+  - mountPath: {{ .Values.persistence.shared.mountPath }}
+    name: shared
 {{- end }}
-{{- if .Values.addons.vpn.additionalVolumeMounts }}
-  {{- toYaml .Values.addons.vpn.additionalVolumeMounts | nindent 2 }}
+{{- with .Values.addons.vpn.additionalVolumeMounts }}
+  {{- toYaml . | nindent 2 }}
 {{- end }}
 {{- end }}
-{{- if .Values.addons.vpn.livenessProbe }}
+{{- with .Values.addons.vpn.livenessProbe }}
 livenessProbe:
-  {{- toYaml .Values.addons.vpn.livenessProbe | nindent 4 }}
+  {{- toYaml . | nindent 4 }}
 {{- end -}}
+{{- with .Values.addons.vpn.resources }}
+resources:
+  {{- toYaml . | nindent 4 }}
+{{- end }}
 {{- end -}}

charts/common/templates/lib/controller/_container.tpl

@@ -38,6 +38,6 @@
 
   {{- with .Values.resources }}
   resources:
-    {{- toYaml . | nindent 12 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end -}}

charts/common/templates/lib/controller/_volumes.tpl

@@ -2,32 +2,30 @@
 volumes included by the controller
 */}}
 {{- define "common.controller.volumes" -}}
-{{/* Store the context to refer in later scope */}}
-{{- $context := . -}}
-{{/* Determine the PVC name */}}
-{{- range $index, $PVC := .Values.persistence }}
-{{- if $PVC.enabled }}
-
-{{- $claimName := "" -}}
-{{- if $PVC.existingClaim -}}
-  {{- $claimName = $PVC.existingClaim -}}
-{{- else }}
-  {{- if $PVC.nameSuffix -}}
-    {{- $claimName = printf "%s-%s" (include "common.names.fullname" $context) $PVC.nameSuffix -}}
-  {{- else }}
-    {{- $claimName = printf "%s-%s" (include "common.names.fullname" $context) $index -}}
-  {{- end -}}
-{{- end -}}
+{{- range $index, $persistence := .Values.persistence }}
+{{- if $persistence.enabled }}
 - name: {{ $index }}
-  {{- if not $PVC.emptyDir }}
+{{- if $persistence.existingClaim }}
+{{/* Always prefer an existingClaim if that is set */}}
   persistentVolumeClaim:
-    claimName: {{ $claimName }}
-  {{- else }}
+    claimName: {{ $persistence.existingClaim }}
+{{- else -}}
+  {{- if $persistence.emptyDir -}}
+  {{/* Always prefer an emptyDir next if that is set */}}
   emptyDir: {}
+  {{- else -}}
+  {{/* Otherwise refer to the PVC name */}}
+  persistentVolumeClaim:
+    {{- if $persistence.nameSuffix }}
+    claimName: {{ printf "%s-%s" (include "common.names.fullname" $) $persistence.nameSuffix }}
+    {{- else }}
+    claimName: {{ printf "%s-%s" (include "common.names.fullname" $) $index }}
+    {{- end }}
   {{- end }}
-{{ end }}
+{{- end }}
+{{- end }}
 {{- end }}
 {{- if .Values.additionalVolumes }}
   {{- toYaml .Values.additionalVolumes | nindent 0 }}
 {{- end }}
-{{- end }}
+{{- end -}}

charts/organizr/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+# OWNERS file for Kubernetes
+OWNERS

charts/organizr/Chart.yaml

@@ -1,9 +1,8 @@
 apiVersion: v2
-name: organizr
-description: HTPC/Homelab Services Organizer - Written in PHP
-type: application
-version: 1.0.2
 appVersion: latest
+description: HTPC/Homelab Services Organizer
+name: organizr
+version: 2.0.0
 keywords:
   - organizr
 home: https://github.com/k8s-at-home/charts/tree/master/charts/organizr
@@ -12,20 +11,9 @@ sources:
   - https://github.com/causefx/Organizr
   - https://hub.docker.com/r/organizr/organizr
 maintainers:
-  - name: DirtyCajunRice
-    email: nick@cajun.pro
-    url: https://github.com/dirtycajunrice
+  - name: billimek
+    email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.0
-    alias: organizr
-annotations:
-  artifacthub.io/links: |
-    - name: App Source
-      url: https://github.com/causefx/Organizr
-    - name: Default Docker Image
-      url: https://hub.docker.com/r/organizr/organizr
-  artifacthub.io/maintainers: |
-    - name: Nicholas St. Germain
-      email: nick@cajun.pro
+    version: ^1.0.4

charts/organizr/OWNERS

@@ -1,4 +1,4 @@
 approvers:
-- DirtyCajunRice
+- billimek
 reviewers:
-- DirtyCajunRice
+- billimek

charts/organizr/README.md

@@ -1,49 +1,52 @@
-# Organizr | HTPC/Homelab Services Organizer - Written in PHP
-Umbrella chart that
-* Uses [media-common](https://github.com/k8s-at-home/charts/tree/master/charts/media-common) as a base
-* Adds docker image information leveraging the [official image](https://hub.docker.com/r/organizr/organizr/)
-* Deploys [Organizr](https://github.com/causefx/Organizr)
+# Organizr
 
-## TL;DR
-```console
+This is a helm chart for [Organizr](https://github.com/causefx/Organizr).
+
+## TL;DR;
+
+```shell
 $ helm repo add k8s-at-home https://k8s-at-home.com/charts/
 $ helm install k8s-at-home/organizr
 ```
 
 ## Installing the Chart
-To install the chart with the release name `organizr`:
+
+To install the chart with the release name `my-release`:
+
 ```console
-helm install organizr k8s-at-home/organizr
+helm install --name my-release k8s-at-home/organizr
 ```
 
 ## Uninstalling the Chart
-To uninstall the `organizr` deployment:
+
+To uninstall/delete the `my-release` deployment:
+
 ```console
-helm uninstall organizr
+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/organizr/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 organizr \
-  --set organizr.env.TZ="America/New York" \
+  --set env.TZ="America/New York" \
     k8s-at-home/organizr
 ```
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
-For example,
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
 helm install organizr k8s-at-home/organizr --values values.yaml 
 ```
 
-These values will be nested as it is a dependency, for example
 ```yaml
-organizr:
-  image:
-    tag: ...
+image:
+  tag: ...
 ```
 
 ---
@@ -56,3 +59,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 1.x.x to 2.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/organizr/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/organizr/templates/NOTES.txt

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

charts/organizr/templates/common.yaml

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

charts/organizr/values.yaml

@@ -1,10 +1,20 @@
-# Default values for organizr.
+# Default values for Organizr.
 
-organizr:
-  image:
-    organization: organizr
-    repository: organizr
-    pullPolicy: IfNotPresent
-    tag: latest
-  service:
+image:
+  repository: organizr/organizr
+  pullPolicy: Always
+  tag: latest
+
+service:
+  port:
     port: 80
+
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
+
+persistence:
+  config:
+    enabled: true
+    emptyDir: true

charts/sabnzbd/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v2
-appVersion: 2.3.9
+appVersion: 3.1.0
 description: Free and easy binary newsreader
 name: sabnzbd
-version: 2.0.1
+version: 3.0.0
 keywords:
   - sabnzbd
   - usenet
@@ -14,3 +14,7 @@ sources:
 maintainers:
   - name: billimek
     email: jeff@billimek.com
+dependencies:
+  - name: common
+    repository: https://k8s-at-home.com/charts/
+    version: ^1.0.4

charts/sabnzbd/OWNERS

@@ -1,4 +1,4 @@
 approvers:
 - billimek
 reviewers:
-- billimek
+- billimek

charts/sabnzbd/README.md

@@ -1,6 +1,6 @@
-# SABnzbd Usenet client
+# Sabnzbd
 
-This is a helm chart for [SABnzbd](https://sabnzbd.org/) leveraging the [Linuxserver.io image](https://hub.docker.com/r/linuxserver/sabnzbd/)
+This is a helm chart for [Sabnzbd](https://github.com/sabnzbd/sabnzbd).
 
 ## TL;DR;
 
@@ -28,75 +28,49 @@ helm delete my-release --purge
 The command removes all the Kubernetes components associated with the chart and deletes the release.
 
 ## Configuration
-
-The following tables lists the configurable parameters of the Sentry chart and their default values.
-
-| Parameter                              | Description                                                                                   | Default                         |
-|----------------------------------------|-----------------------------------------------------------------------------------------------|---------------------------------|
-| `image.repository`                     | Image repository                                                                              | `linuxserver/sabnzbd`           |
-| `image.tag`                            | Image tag. Possible values listed [here](https://hub.docker.com/r/linuxserver/sabnzbd/tags/). | `2.3.9-0ubuntu1jcfp218.04-ls64` |
-| `image.pullPolicy`                     | Image pull policy                                                                             | `IfNotPresent`                  |
-| `strategyType`                         | Specifies the strategy used to replace old Pods by new ones                                   | `Recreate`                      |
-| `timezone`                             | Timezone the sabnzbd instance should run as, e.g. 'America/New_York'                          | `UTC`                           |
-| `puid`                                 | process userID the sabnzbd instance should run as                                             | `1001`                          |
-| `pgid`                                 | process groupID the sabnzbd instance should run as                                            | `1001`                          |
-| `probes.liveness.initialDelaySeconds`  | Specify liveness `initialDelaySeconds` parameter for the deployment                           | `60`                            |
-| `probes.liveness.failureThreshold`     | Specify liveness `failureThreshold` parameter for the deployment                              | `5`                             |
-| `probes.liveness.timeoutSeconds`       | Specify liveness `timeoutSeconds` parameter for the deployment                                | `10`                            |
-| `probes.readiness.initialDelaySeconds` | Specify readiness `initialDelaySeconds` parameter for the deployment                          | `60`                            |
-| `probes.readiness.failureThreshold`    | Specify readiness `failureThreshold` parameter for the deployment                             | `5`                             |
-| `probes.readiness.timeoutSeconds`      | Specify readiness `timeoutSeconds` parameter for the deployment                               | `10`                            |
-| `Service.type`                         | Kubernetes service type for the sabnzbd GUI                                                   | `ClusterIP`                     |
-| `Service.port`                         | Kubernetes port where the sabnzbd GUI is exposed                                              | `8080`                          |
-| `Service.annotations`                  | Service annotations for the sabnzbd GUI                                                       | `{}`                            |
-| `Service.labels`                       | Custom labels                                                                                 | `{}`                            |
-| `Service.loadBalancerIP`               | Loadbalancer IP for the sabnzbd GUI                                                           | `{}`                            |
-| `Service.loadBalancerSourceRanges`     | List of IP CIDRs allowed access to load balancer (if supported)                               | None                            |
-| `ingress.enabled`                      | Enables Ingress                                                                               | `false`                         |
-| `ingress.annotations`                  | Ingress annotations                                                                           | `{}`                            |
-| `ingress.labels`                       | Custom labels                                                                                 | `{}`                            |
-| `ingress.path`                         | Ingress path                                                                                  | `/`                             |
-| `ingress.hosts`                        | Ingress accepted hostnames                                                                    | `chart-example.local`           |
-| `ingress.tls`                          | Ingress TLS configuration                                                                     | `[]`                            |
-| `persistence.config.enabled`           | Use persistent volume to store configuration data                                             | `true`                          |
-| `persistence.config.size`              | Size of persistent volume claim                                                               | `1Gi`                           |
-| `persistence.config.existingClaim`     | Use an existing PVC to persist data                                                           | `nil`                           |
-| `persistence.config.storageClass`      | Type of persistent volume claim                                                               | `-`                             |
-| `persistence.config.accessMode`        | Persistence access mode                                                                       | `ReadWriteOnce`                 |
-| `persistence.config.skipuninstall`     | Do not delete the pvc upon helm uninstall                                                     | `false`                         |
-| `persistence.downloads.enabled`        | Use persistent volume to store configuration data                                             | `true`                          |
-| `persistence.downloads.size`           | Size of persistent volume claim                                                               | `10Gi`                          |
-| `persistence.downloads.existingClaim`  | Use an existing PVC to persist data                                                           | `nil`                           |
-| `persistence.downloads.storageClass`   | Type of persistent volume claim                                                               | `-`                             |
-| `persistence.downloads.accessMode`     | Persistence access mode                                                                       | `ReadWriteOnce`                 |
-| `persistence.downloads.skipuninstall`  | Do not delete the pvc upon helm uninstall                                                     | `false`                         |
-| `persistence.extraMounts`              | Array of additional claims to mount                                                           | `[]`                            |
-| `resources`                            | CPU/Memory resource requests/limits                                                           | `{}`                            |
-| `nodeSelector`                         | Node labels for pod assignment                                                                | `{}`                            |
-| `tolerations`                          | Toleration labels for pod assignment                                                          | `[]`                            |
-| `affinity`                             | Affinity settings for pod assignment                                                          | `{}`                            |
-| `podAnnotations`                       | Key-value pairs to add as pod annotations                                                     | `{}`                            |
-| `deploymentAnnotations`                | Key-value pairs to add as pod annotations                                                     | `{}`                            |
+Read through the charts [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/sabnzbd/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 --name my-release \
-  --set timezone="America/New York" \
+helm install sabnzbd \
+  --set env.TZ="America/New York" \
     k8s-at-home/sabnzbd
 ```
-
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart. For example,
-
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
-helm install --name my-release -f values.yaml stable/sabnzbd
+helm install sabnzbd k8s-at-home/sabnzbd --values values.yaml 
+```
+
+```yaml
+image:
+  tag: ...
 ```
 
 ---
 **NOTE**
 
-If you get `Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...` it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
+If you get
+```console
+Error: rendered manifests contain a resource that already exists. Unable to continue with install: existing resource conflict: ...`
+```
+it may be because you uninstalled the chart with `skipuninstall` enabled, you need to manually delete the pvc or use `existingClaim`.
 
 ---
 
-Read through the [values.yaml](https://github.com/k8s-at-home/charts/blob/master/charts/sabnzbd/values.yaml) file. It has several commented out suggested values.
+## 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 2.x.x to 3.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/sabnzbd/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/sabnzbd/templates/NOTES.txt

@@ -1,19 +1 @@
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "sabnzbd.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.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 "sabnzbd.fullname" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "sabnzbd.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.port }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "sabnzbd.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:80
-{{- end }}
+{{- include "common.notes.defaultNotes" . -}}

charts/sabnzbd/templates/_helpers.tpl

@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "sabnzbd.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "sabnzbd.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "sabnzbd.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}

charts/sabnzbd/templates/common.yaml

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

charts/sabnzbd/templates/config-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.config.enabled (not .Values.persistence.config.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "sabnzbd.fullname" . }}-config
-  {{- if .Values.persistence.config.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    helm.sh/chart: {{ include "sabnzbd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.config.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.config.size | quote }}
-{{- if .Values.persistence.config.storageClass }}
-{{- if (eq "-" .Values.persistence.config.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.config.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/sabnzbd/templates/deployment.yaml

@@ -1,113 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "sabnzbd.fullname" . }}
-  {{- if .Values.deploymentAnnotations }}
-  annotations:
-    {{- range $key, $value := .Values.deploymentAnnotations }}
-    {{ $key }}: {{ $value | quote }}
-    {{- end }}
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    helm.sh/chart: {{ include "sabnzbd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  replicas: 1
-  revisionHistoryLimit: 3
-  strategy:
-    type: {{ .Values.strategyType }}
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-      app.kubernetes.io/instance: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-        app.kubernetes.io/instance: {{ .Release.Name }}
-      {{- if .Values.podAnnotations }}
-      annotations:
-        {{- range $key, $value := .Values.podAnnotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-      {{- end }}
-    spec:
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: http
-              containerPort: 8080
-              protocol: TCP
-          livenessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.liveness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.liveness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.liveness.timeoutSeconds }}
-          readinessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: {{ .Values.probes.readiness.initialDelaySeconds }}
-            failureThreshold: {{ .Values.probes.readiness.failureThreshold }}
-            timeoutSeconds: {{ .Values.probes.readiness.timeoutSeconds }}
-          env:
-            - name: TZ
-              value: "{{ .Values.timezone }}"
-            - name: PUID
-              value: "{{ .Values.puid }}"
-            - name: PGID
-              value: "{{ .Values.pgid }}"
-          volumeMounts:
-            - mountPath: /config
-              name: config
-            - mountPath: /downloads
-              name: downloads
-            {{- if .Values.persistence.downloads.subPath }}
-              subPath: {{ .Values.persistence.downloads.subPath }}
-            {{ end }}
-            {{-  range .Values.persistence.extraMounts }}
-            {{- if .mountPath }}
-            - mountPath: /{{ .mountPath }}
-            {{- else }}
-            - mountPath: /{{ .name }}
-            {{- end }}
-              name: {{ .name }}
-            {{- end }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-      volumes:
-      - name: config
-      {{- if .Values.persistence.config.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.config.existingClaim }}{{ .Values.persistence.config.existingClaim }}{{- else }}{{ template "sabnzbd.fullname" . }}-config{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-      - name: downloads
-      {{- if .Values.persistence.downloads.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ if .Values.persistence.downloads.existingClaim }}{{ .Values.persistence.downloads.existingClaim }}{{- else }}{{ template "sabnzbd.fullname" . }}-downloads{{- end }}
-      {{- else }}
-        emptyDir: {}
-      {{ end }}
-     {{- range .Values.persistence.extraMounts }}
-      - name: {{ .name }}
-        persistentVolumeClaim:
-          claimName: {{ .claimName }}
-     {{- end }}
-    {{- with .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-    {{- end }}
-    {{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-    {{- end }}

charts/sabnzbd/templates/downloads-pvc.yaml

@@ -1,29 +0,0 @@
-
-{{- if and .Values.persistence.downloads.enabled (not .Values.persistence.downloads.existingClaim) }}
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ template "sabnzbd.fullname" . }}-downloads
-  {{- if .Values.persistence.downloads.skipuninstall }}
-  annotations:
-    "helm.sh/resource-policy": keep
-  {{- end }}
-  labels:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    helm.sh/chart: {{ include "sabnzbd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-spec:
-  accessModes:
-    - {{ .Values.persistence.downloads.accessMode | quote }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.downloads.size | quote }}
-{{- if .Values.persistence.downloads.storageClass }}
-{{- if (eq "-" .Values.persistence.downloads.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.downloads.storageClass }}"
-{{- end }}
-{{- end }}
-{{- end -}}

charts/sabnzbd/templates/ingress.yaml

@@ -1,41 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $fullName := include "sabnzbd.fullname" . -}}
-{{- $ingressPath := .Values.ingress.path -}}
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: {{ $fullName }}
-  labels:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    helm.sh/chart: {{ include "sabnzbd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    {{- with .Values.ingress.labels -}}
-    {{ toYaml . | nindent 4 }}
-    {{- end -}}
-{{- with .Values.ingress.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
-  rules:
-  {{- range .Values.ingress.hosts }}
-    - host: {{ . | quote }}
-      http:
-        paths:
-          - path: {{ $ingressPath }}
-            backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
-  {{- end }}
-{{- end }}

charts/sabnzbd/templates/service.yaml

@@ -1,53 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "sabnzbd.fullname" . }}
-  labels:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    helm.sh/chart: {{ include "sabnzbd.chart" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{- if .Values.service.labels }}
-{{ toYaml .Values.service.labels | indent 4 }}
-{{- end }}
-{{- with .Values.service.annotations }}
-  annotations:
-{{ toYaml . | indent 4 }}
-{{- end }}
-spec:
-{{- if (or (eq .Values.service.type "ClusterIP") (empty .Values.service.type)) }}
-  type: ClusterIP
-  {{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-  {{end}}
-{{- else if eq .Values.service.type "LoadBalancer" }}
-  type: {{ .Values.service.type }}
-  {{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- if .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-{{ toYaml .Values.service.loadBalancerSourceRanges | indent 4 }}
-  {{- end -}}
-{{- else }}
-  type: {{ .Values.service.type }}
-{{- end }}
-{{- if .Values.service.externalIPs }}
-  externalIPs:
-{{ toYaml .Values.service.externalIPs | indent 4 }}
-{{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  ports:
-    - name: http
-      port: {{ .Values.service.port }}
-      protocol: TCP
-      targetPort: http
-{{ if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePort))) }}
-      nodePort: {{.Values.service.nodePort}}
-{{ end }}
-  selector:
-    app.kubernetes.io/name: {{ include "sabnzbd.name" . }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
-    

charts/sabnzbd/values.yaml

@@ -1,133 +1,54 @@
-# Default values for sabnzbd.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
+# Default values for Sabnzbd.
 
 image:
   repository: linuxserver/sabnzbd
-  tag: 2.3.9-0ubuntu1jcfp218.04-ls67
   pullPolicy: IfNotPresent
-
-# upgrade strategy type (e.g. Recreate or RollingUpdate)
-strategyType: Recreate
-
-# Probes configuration
-probes:
-  liveness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-  readiness:
-    initialDelaySeconds: 60
-    failureThreshold: 5
-    timeoutSeconds: 10
-
-nameOverride: ""
-fullnameOverride: ""
-
-timezone: UTC
-puid: 1001
-pgid: 1001
+  tag: version-3.1.0
 
 service:
-  type: ClusterIP
-  port: 8080
-  ## 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: {}
-  ## Use loadBalancerIP to request a specific static IP,
-  ## otherwise leave blank
-  ##
-  loadBalancerIP:
-  # loadBalancerSourceRanges: []
-  ## Set the externalTrafficPolicy in the Service to either Cluster or Local
-  # externalTrafficPolicy: Cluster
+  port:
+    port: 8080
 
-ingress:
-  enabled: false
-  annotations: {}
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  labels: {}
-  path: /
-  hosts:
-    - chart-example.local
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
 
 persistence:
   config:
-    enabled: false
-    ## sabnzbd configuration data Persistent Volume Storage Class
+    enabled: true
+    emptyDir: true
+
+  media:
+    enabled: true
+    emptyDir: true
+    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: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    accessMode: ReadWriteOnce
-    size: 1Gi
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
     ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
+    # skipuninstall: false
+    # existingClaim: ""
+
   downloads:
-    enabled: false
-    ## sabnzbd torrents downloads volume configuration
+    enabled: true
+    emptyDir: true
+    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: "-"
-    ##
-    ## If you want to reuse an existing claim, you can pass the name of the PVC using
-    ## the existingClaim variable
-    # existingClaim: your-claim
-    # subPath: some-subpath
-    accessMode: ReadWriteOnce
-    size: 10Gi
+    # accessMode: ReadWriteOnce
+    # size: 1Gi
     ## Do not delete the pvc upon helm uninstall
-    skipuninstall: false
-  extraMounts: []
-  ## Include additional claims that can be mounted inside the
-  ## pod. This is useful if you wish to use different paths with categories
-  ## Claim will me mounted as /{mountPath} if specified. If no {mountPath} is given,
-  ## mountPath will default to {name}
-  # - name: video
-  #   claimName: video-claim
-  #   mountPath: /mnt/path/in/pod
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-podAnnotations: {}
-
-deploymentAnnotations: {}
+    # skipuninstall: false
+    # existingClaim: ""

charts/tautulli/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+# OWNERS file for Kubernetes
+OWNERS

charts/tautulli/Chart.yaml

@@ -1,31 +1,20 @@
 apiVersion: v2
-name: tautulli
+appVersion: v2.6.1
 description: A Python based monitoring and tracking tool for Plex Media Server
-type: application
-version: 4.0.2
-appVersion: v2.5.4
+name: tautulli
+version: 5.0.0
 keywords:
   - tautulli
+  - plex
 home: https://github.com/k8s-at-home/charts/tree/master/charts/tautulli
 icon: https://github.com/Tautulli/Tautulli/blob/master/data/interfaces/default/images/logo.png?raw=true
 sources:
   - https://github.com/Tautulli/Tautulli
   - https://hub.docker.com/r/tautulli/tautulli
 maintainers:
-  - name: DirtyCajunRice
-    email: nick@cajun.pro
-    url: https://github.com/dirtycajunrice
+  - name: billimek
+    email: jeff@billimek.com
 dependencies:
-  - name: media-common
+  - name: common
     repository: https://k8s-at-home.com/charts/
-    version: ^1.0.0
-    alias: tautulli
-annotations:
-  artifacthub.io/links: |
-    - name: App Source
-      url: https://github.com/Tautulli/Tautulli
-    - name: Default Docker Image
-      url: https://hub.docker.com/r/tautulli/tautulli
-  artifacthub.io/maintainers: |
-    - name: Nicholas St. Germain
-      email: nick@cajun.pro
+    version: ^1.0.4

charts/tautulli/OWNERS

@@ -1,4 +1,4 @@
 approvers:
-- DirtyCajunRice
+- billimek
 reviewers:
-- DirtyCajunRice
+- billimek

charts/tautulli/README.md

@@ -1,53 +1,52 @@
-# Tautulli | A Python based monitoring and tracking tool for Plex Media Server
-Umbrella chart that
-* Uses [media-common](https://github.com/k8s-at-home/charts/tree/master/charts/media-common) as a base
-* Adds docker image information leveraging the [official image](https://hub.docker.com/r/tautulli/tautulli/)
-* Deploys [Tautulli](https://github.com/Tautulli/Tautulli)
+# Tautulli
 
-## TL;DR
-```console
+This is a helm chart for [Tautulli](https://github.com/Tautulli/Tautulli).
+
+## TL;DR;
+
+```shell
 $ helm repo add k8s-at-home https://k8s-at-home.com/charts/
 $ helm install k8s-at-home/tautulli
 ```
 
 ## Installing the Chart
-To install the chart with the release name `tautulli`:
-```console
-helm install tautulli k8s-at-home/tautulli
-```
 
-## Upgrading
-Chart versions before 4.0.0 did not use media-common. Upgrading will require you to nest your values.yaml file under
-a top-level `tautulli:` key.
+To install the chart with the release name `my-release`:
+
+```console
+helm install --name my-release k8s-at-home/tautulli
+```
 
 ## Uninstalling the Chart
-To uninstall the `tautulli` deployment:
+
+To uninstall/delete the `my-release` deployment:
+
 ```console
-helm uninstall tautulli
+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/tautulli/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 tautulli \
-  --set tautulli.env.TZ="America/New York" \
+  --set env.TZ="America/New York" \
     k8s-at-home/tautulli
 ```
-Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the chart.
-For example,
+Alternatively, a YAML file that specifies the values for the above parameters can be provided while installing the
+chart. For example,
 ```console
 helm install tautulli k8s-at-home/tautulli --values values.yaml 
 ```
 
-These values will be nested as it is a dependency, for example
 ```yaml
-tautulli:
-  image:
-    tag: ...
+image:
+  tag: ...
 ```
 
 ---
@@ -60,3 +59,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 4.x.x to 5.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/tautulli/ci/ct-values.yaml

@@ -0,0 +1,2 @@
+ingress:
+  enabled: true

charts/tautulli/templates/NOTES.txt

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

charts/tautulli/templates/common.yaml

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

charts/tautulli/values.yaml

@@ -1,10 +1,20 @@
-# Default values for tautulli.
+# Default values for Tautulli.
 
-tautulli:
-  image:
-    organization: tautulli
-    repository: tautulli
-    pullPolicy: IfNotPresent
-    tag: v2.5.4
-  service:
+image:
+  repository: tautulli/tautulli
+  pullPolicy: IfNotPresent
+  tag: v2.5.4
+
+service:
+  port:
     port: 8181
+
+env: {}
+  # TZ: UTC
+  # PUID: 1001
+  # PGID: 1001
+
+persistence:
+  config:
+    enabled: true
+    emptyDir: true