Properly render services in common chart

library/common/templates/_serviceaccount.tpl

@@ -1,11 +1,11 @@
-{{-/*
+{{/*
 Common service account
-*/-}}
+*/}}
 {{- define "common.serviceaccount" -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ include "common.names.serviceAccountName" . | quote }}
   namespace: {{ .Release.Namespace | quote }}
-  labels: {{- include "common.labels.selectorLabels" | nindent 4 -}}
+  labels: {{- include "common.labels.selectorLabels" . | nindent 4 -}}
 {{- end -}}

library/common/templates/classes/_service.tpl

@@ -3,7 +3,7 @@ This template serves as a blueprint for all Service objects that are created
 within the common library.
 */}}
 {{- define "common.classes.service" -}}
-{{- $values := . -}}
+{{- $values := .service -}}
 {{- $serviceName := include "common.names.fullname" . -}}
 {{- if hasKey $values "nameSuffix" -}}
   {{- $serviceName = printf "%v-%v" $serviceName $values.nameSuffix -}}