[common] 2.0.3 (#368)

Co-authored-by: Bᴇʀɴᴅ Sᴄʜᴏʀɢᴇʀs <6213398+bjw-s@users.noreply.github.com>

.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/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 -}}
+*/}}