fix(common): Release 2.0.2 (#196)

charts/library/common/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 2.0.1
+version: 2.0.2
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
@@ -16,10 +16,7 @@ annotations:
   artifacthub.io/changes: |-
     - kind: fixed
       description: |-
-        Mounting of volumeClaimTemplates was not implemented properly.
+        ServiceAccount could not be referenced without creating
     - kind: fixed
       description: |-
-        Using advancedMounts for initContainers resulted in an error.
-    - kind: fixed
-      description: |-
-        Validations for container images have been improved.
+        Controllers without a type did not default to Deployment

charts/library/common/README.md

@@ -1,6 +1,6 @@
 # common
 
-![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
+![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square)
 
 Function library for Helm charts
 
@@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
   - name: common
-    version: 2.0.1
+    version: 2.0.2
     repository: https://bjw-s.github.io/helm-charts/
 ```
 

charts/library/common/templates/lib/controller/_valuesToObject.tpl

@@ -6,6 +6,11 @@ Convert controller values to an object
   {{- $identifier := .id -}}
   {{- $objectValues := .values -}}
 
+  {{- /* Default the controller type to Deployment */ -}}
+  {{- if eq (dig "type" "" $objectValues) ""  -}}
+    {{- $_ := set $objectValues "type" "deployment" -}}
+  {{- end -}}
+
   {{- /* Determine and inject the controller name */ -}}
   {{- $objectName := (include "bjw-s.common.lib.chart.names.fullname" $rootContext) -}}
 

charts/library/common/templates/lib/pod/fields/_serviceAccountName.tpl

@@ -4,15 +4,8 @@ Returns the value for serviceAccountName
 {{- define "bjw-s.common.lib.pod.field.serviceAccountName" -}}
   {{- $rootContext := .ctx.rootContext -}}
 
-  {{- /* Default to "default" */ -}}
-  {{- $name := "default" -}}
+  {{- $serviceAccountValues := (mustDeepCopy $rootContext.Values.serviceAccount) -}}
+  {{- $serviceAccountObject := (include "bjw-s.common.lib.serviceAccount.valuesToObject" (dict "rootContext" $rootContext "id" "default" "values" $serviceAccountValues)) | fromYaml -}}
+  {{- $serviceAccountObject.name -}}
 
-  {{- /* See if an override is needed */ -}}
-  {{- if $rootContext.Values.serviceAccount.create -}}
-    {{- $serviceAccountValues := (mustDeepCopy $rootContext.Values.serviceAccount) -}}
-    {{- $serviceAccountObject := (include "bjw-s.common.lib.serviceAccount.valuesToObject" (dict "rootContext" $rootContext "id" "default" "values" $serviceAccountValues)) | fromYaml -}}
-    {{- $name = $serviceAccountObject.name -}}
-  {{- end -}}
-
-  {{- $name -}}
 {{- end -}}

charts/library/common/templates/lib/service/_validate.tpl

@@ -6,7 +6,7 @@ Validate Service values
   {{- $serviceObject := .object -}}
 
   {{- if empty (get $serviceObject "controller") -}}
-    {{- fail (printf "controller is required for Service. (service: %s)" $serviceObject.identifier) -}}
+    {{- fail (printf "controller field is required for Service. (service: %s)" $serviceObject.identifier) -}}
   {{- end -}}
 
   {{- /* Validate Service type */ -}}

charts/library/common/templates/lib/serviceAccount/_valuesToObject.tpl

@@ -1,5 +1,5 @@
 {{/*
-Convert Secret values to an object
+Convert ServiceAccount values to an object
 */}}
 {{- define "bjw-s.common.lib.serviceAccount.valuesToObject" -}}
   {{- $rootContext := .rootContext -}}
@@ -7,12 +7,15 @@ Convert Secret values to an object
   {{- $objectValues := .values -}}
 
   {{- /* Determine and inject the serviceAccount name */ -}}
-  {{- $objectName := (include "bjw-s.common.lib.chart.names.fullname" $rootContext) -}}
-
-  {{- if $objectValues.name -}}
-    {{- $objectName = $objectValues.name -}}
+  {{- $serviceAccountName := "" -}}
+  {{- $defaultServiceAccountName := "default" -}}
+  {{- if $objectValues.create -}}
+    {{- $defaultServiceAccountName = (include "bjw-s.common.lib.chart.names.fullname" $rootContext) -}}
   {{- end -}}
-  {{- $_ := set $objectValues "name" $objectName -}}
+
+  {{- $serviceAccountName = default $defaultServiceAccountName $objectValues.name -}}
+
+  {{- $_ := set $objectValues "name" $serviceAccountName -}}
   {{- $_ := set $objectValues "identifier" $identifier -}}
 
   {{- /* Return the serviceAccount object */ -}}