From daa104d60e258fff57da12f13c49ecdcba1263c6 Mon Sep 17 00:00:00 2001
From: Martin Hickey <martin.hickey@ie.ibm.com>
Date: Thu, 3 Sep 2020 17:13:31 +0000
Subject: [PATCH] Revert PR 8562

Revert of PR 8562 as the container version may not represent the
application version.

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
---
 pkg/chartutil/create.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go
index 8d8f48176..6e382b961 100644
--- a/pkg/chartutil/create.go
+++ b/pkg/chartutil/create.go
@@ -425,7 +425,9 @@ Common labels
 {{- define "<CHARTNAME>.labels" -}}
 helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
 {{ include "<CHARTNAME>.selectorLabels" . }}
-app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}