feat(common): Release version 2.0.0-beta.1 (#173)

charts/library/common/templates/classes/_configmap.tpl

@@ -2,33 +2,31 @@
 This template serves as a blueprint for all configMap objects that are created
 within the common library.
 */}}
-{{- define "bjw-s.common.class.configmap" -}}
-  {{- $fullName := include "bjw-s.common.lib.chart.names.fullname" . -}}
-  {{- $configMapName := $fullName -}}
-  {{- $values := .Values.configmap -}}
+{{- define "bjw-s.common.class.configMap" -}}
+  {{- $rootContext := .rootContext -}}
+  {{- $configMapObject := .object -}}
 
-  {{- if hasKey . "ObjectValues" -}}
-    {{- with .ObjectValues.configmap -}}
-      {{- $values = . -}}
-    {{- end -}}
-  {{ end -}}
-
-  {{- if and (hasKey $values "nameOverride") $values.nameOverride -}}
-    {{- $configMapName = printf "%v-%v" $configMapName $values.nameOverride -}}
-  {{- end }}
+  {{- $labels := merge
+    ($configMapObject.labels | default dict)
+    (include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
+  -}}
+  {{- $annotations := merge
+    ($configMapObject.annotations | default dict)
+    (include "bjw-s.common.lib.metadata.globalAnnotations" $rootContext | fromYaml)
+  -}}
 ---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ $configMapName }}
-  {{- with (merge ($values.labels | default dict) (include "bjw-s.common.lib.metadata.allLabels" $ | fromYaml)) }}
-  labels: {{- toYaml . | nindent 4 }}
+  name: {{ $configMapObject.name }}
+  {{- with $labels }}
+  labels: {{- toYaml . | nindent 4 -}}
   {{- end }}
-  {{- with (merge ($values.annotations | default dict) (include "bjw-s.common.lib.metadata.globalAnnotations" $ | fromYaml)) }}
-  annotations: {{- toYaml . | nindent 4 }}
+  {{- with $annotations }}
+  annotations: {{- toYaml . | nindent 4 -}}
   {{- end }}
 data:
-{{- with $values.data }}
-  {{- tpl (toYaml .) $ | nindent 2 }}
-{{- end }}
+  {{- with $configMapObject.data }}
+    {{- tpl (toYaml .) $rootContext | nindent 2 }}
+  {{- end }}
 {{- end -}}