[dashmachine] Update helm chart common to v2 (#370)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: ᗪєνιη ᗷυнʟ <onedr0p@users.noreply.github.com>

.github/renovate.json5

@@ -24,7 +24,7 @@
       "updateTypes": ["major"],
       "bumpVersion": "major",
       "labels": ["dependency/major"],
-      "packageNames": [
+      "packagePatterns": [
         "common"
       ]
     },
@@ -33,7 +33,7 @@
       "updateTypes": ["minor"],
       "bumpVersion": "minor",
       "labels": ["dependency/minor"],
-      "packageNames": [
+      "packagePatterns": [
         "common"
       ]
     },
@@ -42,7 +42,7 @@
       "updateTypes": ["patch"],
       "bumpVersion": "patch",
       "labels": ["dependency/patch"],
-      "packageNames": [
+      "packagePatterns": [
         "common"
       ]
     },
@@ -54,7 +54,7 @@
       "updateTypes": ["major"],
       "bumpVersion": "major",
       "labels": ["dependency/major"],
-      "excludePackageNames": [
+      "excludePackagePatterns": [
         "common"
       ],
       "schedule": [
@@ -66,7 +66,7 @@
       "updateTypes": ["minor"],
       "bumpVersion": "minor",
       "labels": ["dependency/minor"],
-      "excludePackageNames": [
+      "excludePackagePatterns": [
         "common"
       ],
       "schedule": [
@@ -78,7 +78,7 @@
       "updateTypes": ["patch"],
       "bumpVersion": "patch",
       "labels": ["dependency/patch"],
-      "excludePackageNames": [
+      "excludePackagePatterns": [
         "common"
       ],
       "schedule": [

.github/workflows/lint-test.yaml

@@ -41,6 +41,11 @@ jobs:
         run: ct lint --config .github/ct.yaml
         if: steps.list-changed.outputs.changed == 'true'
 
+      - name: Run chart-testing (lint common-test)
+        run: |
+          ct lint --config .github/ct.yaml --charts 'charts/common-test'
+        if: steps.list-changed.outputs.common == 'true'
+
       - name: Create kind cluster
         uses: helm/kind-action@v1.1.0
         if: steps.list-changed.outputs.changed == 'true' || steps.list-changed.outputs.common == 'true'

charts/alertmanager-bot/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.4.2
 description: Bot for Prometheus Alertmanager
 name: alertmanager-bot
-version: 1.2.0
+version: 2.0.0
 keywords:
   - alertmanager
   - telegram
@@ -18,4 +18,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 1.7.0
+    version: 2.0.3

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.8.0
+version: 5.0.0
 keywords:
   - bazarr
   - radarr
@@ -21,4 +21,4 @@ maintainers:
 dependencies:
   - name: common
     repository: https://k8s-at-home.com/charts/
-    version: 1.7.0
+    version: 2.0.3

charts/common-test/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: common-test
 description: Helper chart to test different use cases of the common library
-version: 1.0.0
+version: 1.0.1
 keywords:
   - k8s-at-home
   - common
@@ -12,3 +12,4 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../common
+    version: n/a

charts/common-test/values.yaml

@@ -0,0 +1,11 @@
+image:
+  repository: b4bz/homer
+  tag: latest
+  pullPolicy: IfNotPresent
+
+service:
+  port:
+    port: 8080
+
+ingress:
+  enabled: true

charts/common/Chart.yaml

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

charts/common/templates/classes/_ingress.tpl

@@ -43,11 +43,11 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }}
             pathType: Prefix
             {{- end }}
             backend:
-            {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }}
+            {{- if eq (include "common.capabilities.ingress.apiVersion" $) "networking.k8s.io/v1" }}
               service:
                 name: {{ $svcName }}
                 port:

charts/common/templates/lib/chart/_capabilities.tpl

@@ -2,38 +2,84 @@
 Return the appropriate apiVersion for DaemonSet objects.
 */}}
 {{- define "common.capabilities.daemonset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.daemonset.apiVersion" -}}
 {{- if .Capabilities.APIVersions.Has "apps/v1/DaemonSet" -}}
 {{- print "apps/v1" -}}
 {{- else -}}
 {{- print "extensions/v1beta1" -}}
 {{- end -}}
 {{- end -}}
+*/}}
 
 {{/*
 Return the appropriate apiVersion for Deployment objects.
 */}}
 {{- define "common.capabilities.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.deployment.apiVersion" -}}
 {{- if .Capabilities.APIVersions.Has "apps/v1/Deployment" -}}
 {{- print "apps/v1" -}}
 {{- else -}}
 {{- print "extensions/v1beta1" -}}
 {{- end -}}
 {{- end -}}
+*/}}
 
 {{/*
 Return the appropriate apiVersion for StatefulSet objects.
 */}}
 {{- define "common.capabilities.statefulset.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
+{{- define "common.capabilities.statefulset.apiVersion" -}}
 {{- if .Capabilities.APIVersions.Has "apps/v1/StatefulSet" -}}
 {{- print "apps/v1" -}}
 {{- else -}}
 {{- print "apps/v1beta1" -}}
 {{- end -}}
 {{- end -}}
+*/}}
 
 {{/*
 Return the appropriate apiVersion for Ingress objects.
 */}}
+
+{{- define "common.capabilities.ingress.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else if semverCompare "<1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "networking.k8s.io/v1beta1" -}}
+{{- else -}}
+{{- print "networking.k8s.io/v1" -}}
+{{- end }}
+{{- end -}}
+
+{{/*
+Waiting on https://github.com/helm/helm/pull/8608
 {{- define "common.capabilities.ingress.apiVersion" -}}
 {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}}
 {{- print "networking.k8s.io/v1" -}}
@@ -43,3 +89,4 @@ Return the appropriate apiVersion for Ingress objects.
 {{- print "extensions/v1beta1" -}}
 {{- end }}
 {{- end -}}
+*/}}

charts/dashmachine/Chart.yaml

@@ -4,7 +4,7 @@ description: DashMachine is another web application bookmark dashboard, with fun
 icon: https://github.com/rmountjoy92/DashMachine/raw/master/dashmachine/static/images/logo/logo.png
 home: https://github.com/rmountjoy92/DashMachine
 name: dashmachine
-version: 2.2.0
+version: 3.0.0
 sources:
   - https://github.com/rmountjoy92/DashMachine
 maintainers:
@@ -12,5 +12,5 @@ maintainers:
     email: ryan@ryanholt.net
 dependencies:
   - name: common
-    version: 1.7.0
+    version: 2.0.3
     repository: https://k8s-at-home.com/charts/