[multiple] Bump library version (#157 )

[common] Resolve indenting issues, fixes #155 (#156 )
2020-11-14 09:42:45 -05:00 · 2020-11-14 08:41:05 -05:00
20 changed files with 45 additions and 40 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.3.0
+version: 4.4.0
 keywords:
  - bazarr
  - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.4.0
+version: 1.5.0
 keywords:
  - k8s-at-home
  - common
--- a/charts/common/templates/_deployment.tpl
+++ b/charts/common/templates/_deployment.tpl
@@ -53,14 +53,14 @@ spec:

      {{- with .Values.nodeSelector }}
      nodeSelector:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
      {{- with .Values.affinity }}
      affinity:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
      {{- with .Values.tolerations }}
      tolerations:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
 {{- end }}
--- a/charts/common/templates/_ingress.tpl
+++ b/charts/common/templates/_ingress.tpl
@@ -4,7 +4,6 @@

    {{- /* Generate primary ingress */ -}}
    {{- $ingressValues := .Values.ingress -}}
-    {{- $_ := set $ingressValues "svcPort" $svcPort -}}
    {{- $_ := set . "ObjectValues" (dict "ingress" $ingressValues) -}}
    {{- include "common.classes.ingress" . }}

@@ -13,7 +12,6 @@
      {{- if $extraIngress.enabled -}}
        {{- print ("---") | nindent 0 -}}
        {{- $ingressValues := $extraIngress -}}
-        {{- $_ := set $ingressValues "svcPort" $svcPort -}}
        {{- if not $ingressValues.nameSuffix -}}
          {{- $_ := set $ingressValues "nameSuffix" $index -}}
        {{ end -}}
--- a/charts/common/templates/_statefulset.tpl
+++ b/charts/common/templates/_statefulset.tpl
@@ -54,14 +54,14 @@ spec:

      {{- with .Values.nodeSelector }}
      nodeSelector:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
      {{- with .Values.affinity }}
      affinity:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
      {{- with .Values.tolerations }}
      tolerations:
-        {{- toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
      {{- end }}
 {{- end }}
--- a/charts/common/templates/classes/_ingress.tpl
+++ b/charts/common/templates/classes/_ingress.tpl
@@ -9,7 +9,8 @@
 {{- if hasKey $values "nameSuffix" -}}
  {{- $ingressName = printf "%v-%v" $ingressName $values.nameSuffix -}}
 {{ end -}}
-{{- $svcPort := $values.svcPort -}}
+{{- $svcName := $values.serviceName | default (include "common.names.fullname" .) -}}
+{{- $svcPort := $values.servicePort | default $.Values.service.port.port -}}
 apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
@@ -39,7 +40,7 @@ spec:
          {{- range .paths }}
          - path: {{ .path }}
            backend:
-              serviceName: {{ $ingressName }}
+              serviceName: {{ $svcName }}
              servicePort: {{ $svcPort }}
          {{- end }}
  {{- end }}
--- a/charts/common/templates/lib/chart/_values.tpl
+++ b/charts/common/templates/lib/chart/_values.tpl
@@ -3,7 +3,7 @@
  {{- if .Values.common -}}
    {{- $defaultValues := deepCopy .Values.common -}}
    {{- $userValues := deepCopy (omit .Values "common") -}}
-    {{- $mergedValues := mustMerge $userValues $defaultValues -}}
+    {{- $mergedValues := mustMergeOverwrite $defaultValues $userValues -}}
    {{- $_ := set . "Values" (deepCopy $mergedValues) -}}
  {{- end }}  
 {{- end }}
--- a/charts/common/values.yaml
+++ b/charts/common/values.yaml
@@ -102,8 +102,8 @@ ingress:
  #     - host: chart-example.local
  #       paths:
  #         - path: /api
-  #          # Ignored if not kubeVersion >= 1.14-0
-  #          pathType: Prefix
+  #           # Ignored if not kubeVersion >= 1.14-0
+  #           pathType: Prefix
  #   tls: []
  #   #  - secretName: chart-example-tls
  #   #    hosts:
@@ -141,6 +141,12 @@ additionalVolumes: []

 additionalVolumeMounts: []

+nodeSelector: {}
+
+affinity: {}
+
+tolerations: []
+
 addons:
  vpn:
    enabled: false
--- 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.3.0
+version: 5.4.0
 keywords:
  - jackett
  - torrent
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 5.4.0
 keywords:
  - lidarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 6.4.0
 keywords:
  - nzbget
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 4.4.0
 keywords:
  - nzbhydra2
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 5.4.0
 keywords:
  - ombi
  - plex
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 2.4.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.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 6.4.0
 keywords:
  - qbittorrent
  - torrrent
@@ -16,4 +16,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 7.4.0
 keywords:
  - radarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 3.4.0
 keywords:
  - sabnzbd
  - usenet
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 7.4.0
 keywords:
  - sonarr
  - torrent
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- 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.3.0
+version: 5.4.0
 keywords:
  - tautulli
  - plex
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
--- a/charts/zwave2mqtt/Chart.yaml
+++ b/charts/zwave2mqtt/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 4.0.6
 description: Fully configurable Zwave to MQTT gateway and Control Panel using NodeJS and Vue
 name: zwave2mqtt
-version: 5.0.0
+version: 5.1.0
 keywords:
  - zwave
  - mqtt
@@ -17,4 +17,4 @@ maintainers:
 dependencies:
  - name: common
    repository: https://k8s-at-home.com/charts/
-    version: ^1.4.0
+    version: ^1.5.0
Author	SHA1	Message	Date
Bernd Schörgers	0ec462c58e	[multiple] Bump library version (#157 )	2020-11-14 09:42:45 -05:00
Bernd Schörgers	533f78729b	[common] Resolve indenting issues, fixes #155 (#156 )	2020-11-14 08:41:05 -05:00