[common] Fix fluxv2 issues (#144 )

Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>
[multiple] Bump library version (#143 )
2020-11-12 13:17:01 -05:00 · 2020-11-11 16:50:43 -05:00 · 2020-11-11 16:09:17 -05:00 · 2020-11-11 14:09:22 -05:00
30 changed files with 93 additions and 36 deletions
--- a/charts/bazarr/Chart.yaml
+++ b/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.2
+version: 4.2.0
 keywords:
  - bazarr
  - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/bazarr/values.yaml
+++ b/charts/bazarr/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-v0.9.0.5

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 6767
--- a/charts/common/Chart.yaml
+++ b/charts/common/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: common
 description: Function library for k8s-at-home charts
 type: library
-version: 1.2.0
+version: 1.4.0
 keywords:
  - k8s-at-home
  - common
--- a/charts/common/templates/_all.tpl
+++ b/charts/common/templates/_all.tpl
@@ -1,8 +1,6 @@
 {{- define "common.all" -}}
  {{- /* Merge the local chart values and the common chart defaults */ -}}
-  {{- $defaultValues := .Values.common -}}
-  {{- $_ := deepCopy $defaultValues | merge .Values -}}
-  {{- $_ := unset .Values "common" -}}
+  {{- include "common.values.setup" . }}
  
  {{- /* Enable OpenVPN VPN add-on if required */ -}}
  {{- if .Values.addons.vpn.enabled }}
--- a/charts/common/templates/_deployment.tpl
+++ b/charts/common/templates/_deployment.tpl
@@ -4,16 +4,20 @@ kind: Deployment
 metadata:
  name: {{ template "common.names.fullname" . }}
  labels:
-  {{- include "common.labels" . | nindent 4 }}
-  {{- with .Values.controllerLabels }}
-  {{- toYaml . | nindent 4 }}
-  {{- end }}
+    {{- include "common.labels" . | nindent 4 }}
+    {{- with .Values.controllerLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
  {{- with .Values.controllerAnnotations }}
  annotations:
-  {{- toYaml . | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas }}
+  {{- with .Values.strategy }}
+  strategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "common.labels.selectorLabels" . | nindent 6 }}
--- a/charts/common/templates/_statefulset.tpl
+++ b/charts/common/templates/_statefulset.tpl
@@ -13,7 +13,11 @@ metadata:
  {{- toYaml . | nindent 4 }}
  {{- end }}
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicas }}
+  {{- with .Values.strategy }}
+  updateStrategy:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
  selector:
    matchLabels:
    {{- include "common.labels.selectorLabels" . | nindent 6 }}
--- a/charts/common/templates/lib/chart/_values.tpl
+++ b/charts/common/templates/lib/chart/_values.tpl
@@ -0,0 +1,9 @@
+{{- define "common.values.setup" -}}
+  {{- /* Merge the local chart values and the common chart defaults */ -}}
+  {{- if .Values.common -}}
+    {{- $defaultValues := deepCopy .Values.common -}}
+    {{- $userValues := deepCopy (omit .Values "common") -}}
+    {{- $mergedValues := mustMerge $userValues $defaultValues -}}
+    {{- $_ := set . "Values" (deepCopy $mergedValues) -}}
+  {{- end }}  
+{{- end }}
--- a/charts/common/values.yaml
+++ b/charts/common/values.yaml
@@ -5,6 +5,12 @@ controllerAnnotations: {}
 # Set labels on the deployment/statefulset
 controllerLabels: {}

+replicas: 1
+strategy:
+  ## For Deployments, valid values are Recreate and RollingUpdate
+  ## For StatefulSets, valid values are OnDelete and RollingUpdate
+  type: RollingUpdate
+
 # Set annotations on the pod
 podAnnotations: {}

@@ -37,7 +43,7 @@ service:
  type: ClusterIP
  # Specify the default port information
  port:
-    port: ""
+    port:
    name: http
    protocol: TCP
    targetPort: http
--- a/charts/jackett/Chart.yaml
+++ b/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.4
+version: 5.2.0
 keywords:
  - jackett
  - torrent
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/jackett/values.yaml
+++ b/charts/jackett/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-v0.16.2106

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 9117
--- a/charts/lidarr/Chart.yaml
+++ b/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.2
+version: 5.2.0
 keywords:
  - lidarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/lidarr/values.yaml
+++ b/charts/lidarr/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-0.8.0.1886

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 8686
--- a/charts/nzbget/Chart.yaml
+++ b/charts/nzbget/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v21.0
 description: NZBGet is a Usenet downloader client
 name: nzbget
-version: 6.0.1
+version: 6.2.0
 keywords:
  - nzbget
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/nzbget/values.yaml
+++ b/charts/nzbget/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-v21.0

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 6789
--- a/charts/nzbhydra2/Chart.yaml
+++ b/charts/nzbhydra2/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v3.4.3
 description: Usenet meta search
 name: nzbhydra2
-version: 4.0.2
+version: 4.2.0
 keywords:
  - nzbhydra2
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/nzbhydra2/values.yaml
+++ b/charts/nzbhydra2/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-v3.4.3

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 5076
--- a/charts/ombi/Chart.yaml
+++ b/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.2
+version: 5.2.0
 keywords:
  - ombi
  - plex
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/ombi/values.yaml
+++ b/charts/ombi/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-v4.0.681

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 3579
--- a/charts/organizr/Chart.yaml
+++ b/charts/organizr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: latest
 description: HTPC/Homelab Services Organizer
 name: organizr
-version: 2.0.2
+version: 2.2.0
 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.1.0
+    version: ^1.3.0
--- a/charts/organizr/values.yaml
+++ b/charts/organizr/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: Always
  tag: latest

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 80
--- a/charts/qbittorrent/Chart.yaml
+++ b/charts/qbittorrent/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.3.0
 description: qBittorrent is a cross-platform free and open-source BitTorrent client
 name: qbittorrent
-version: 6.0.1
+version: 6.2.0
 keywords:
  - qbittorrent
  - torrrent
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/qbittorrent/values.yaml
+++ b/charts/qbittorrent/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-4.3.0202010181232-7086-1c663adeeubuntu18.04.1

+strategy:
+  type: Recreate
+
 env: {}
  # TZ: UTC
  # PUID: 1001
--- a/charts/radarr/Chart.yaml
+++ b/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.2
+version: 7.2.0
 keywords:
  - radarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/radarr/values.yaml
+++ b/charts/radarr/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-3.0.0.3989

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 7878
--- a/charts/sabnzbd/Chart.yaml
+++ b/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.2
+version: 3.2.0
 keywords:
  - sabnzbd
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/sabnzbd/values.yaml
+++ b/charts/sabnzbd/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-3.1.0

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 8080
--- a/charts/sonarr/Chart.yaml
+++ b/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.3
+version: 7.2.0
 keywords:
  - sonarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/sonarr/values.yaml
+++ b/charts/sonarr/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: version-3.0.4.993

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 8989
--- a/charts/tautulli/Chart.yaml
+++ b/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.2
+version: 5.2.0
 keywords:
  - tautulli
  - plex
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.1.0
+    version: ^1.3.0
--- a/charts/tautulli/values.yaml
+++ b/charts/tautulli/values.yaml
@@ -5,6 +5,9 @@ image:
  pullPolicy: IfNotPresent
  tag: v2.5.4

+strategy:
+  type: Recreate
+
 service:
  port:
    port: 8181
Author	SHA1	Message	Date
Bernd Schörgers	1aa1b7f67e	[common] Fix fluxv2 issues (#144 ) Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>	2020-11-12 13:17:01 -05:00
Bernd Schörgers	7d02733b54	[multiple] Bump library version (#143 ) Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>	2020-11-11 16:50:43 -05:00
Bernd Schörgers	e54addcc77	[common] Allow setting strategy and replicas (#142 )	2020-11-11 16:09:17 -05:00
Bernd Schörgers	e3420259d5	[multiple] Update common library (#141 )	2020-11-11 14:09:22 -05:00