From 24045b305fe73ead049a42c4d3fb077ba0ccfce0 Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Fri, 29 Jan 2021 23:40:08 +0500
Subject: [PATCH] Properly render services in common chart

---
 library/common/templates/_serviceaccount.tpl  | 6 +++---
 library/common/templates/classes/_service.tpl | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/library/common/templates/_serviceaccount.tpl b/library/common/templates/_serviceaccount.tpl
index 588c968bde..b96d4009a9 100644
--- a/library/common/templates/_serviceaccount.tpl
+++ b/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 -}}
diff --git a/library/common/templates/classes/_service.tpl b/library/common/templates/classes/_service.tpl
index 08a0b1b31b..d563e1d0d5 100644
--- a/library/common/templates/classes/_service.tpl
+++ b/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 -}}