Add app.kubernetes.io/version label

Signed-off-by: Luis Davim <luis.davim@jet.com>

cmd/helm/testdata/testcharts/alpine/templates/alpine-pod.yaml

@@ -10,6 +10,7 @@ metadata:
     # The "release" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
     app.kubernetes.io/instance: {{.Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
     values: {{.Values.test.Name}}

cmd/helm/testdata/testcharts/chart-bad-type/templates/alpine-pod.yaml

@@ -9,7 +9,8 @@ metadata:
     heritage: {{.Release.Service | quote }}
     # The "release" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
-    release: {{.Release.Name | quote }}
+    app.kubernetes.io/instance: {{.Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     chart: "{{.Chart.Name}}-{{.Chart.Version}}"
     values: {{.Values.test.Name}}

cmd/helm/testdata/testcharts/novals/templates/alpine-pod.yaml

@@ -10,6 +10,7 @@ metadata:
     # The "release" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
     app.kubernetes.io/instance: {{.Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
   annotations:

docs/chart_template_guide/variables.md

@@ -117,6 +117,7 @@ metadata:
     # I cannot reference .Chart.Name, but I can do $.Chart.Name
     helm.sh/chart: "{{ $.Chart.Name }}-{{ $.Chart.Version }}"
     app.kubernetes.io/instance: "{{ $.Release.Name }}"
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/managed-by: "{{ $.Release.Service }}"
 type: kubernetes.io/tls
 data:

docs/charts_hooks.md

@@ -116,6 +116,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: {{.Release.Service | quote }}
     app.kubernetes.io/instance: {{.Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
   annotations:
     # This is what defines this resource as a hook. Without this line, the

docs/examples/alpine/templates/alpine-pod.yaml

@@ -9,7 +9,8 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     # The "app.kubernetes.io/instance" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
-    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "alpine.name" . }}

docs/examples/nginx/templates/configmap.yaml

@@ -6,6 +6,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "nginx.name" . }}
 data:

docs/examples/nginx/templates/deployment.yaml

@@ -13,6 +13,7 @@ metadata:
     # The "app.kubernetes.io/instance" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "nginx.name" . }}

docs/examples/nginx/templates/post-install-job.yaml

@@ -10,6 +10,7 @@ metadata:
     # The "app.kubernetes.io/instance" convention makes it easy to tie a release to all of the
     # Kubernetes resources that were created as part of that release.
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     # This makes it easy to audit chart usage.
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "nginx.name" . }}

docs/examples/nginx/templates/pre-install-secret.yaml

@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "nginx.name" . }}
   # This declares the resource to be a hook. By convention, we also name the

docs/examples/nginx/templates/service-test.yaml

@@ -5,6 +5,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/name: {{ template "nginx.name" . }}
   annotations:

docs/examples/nginx/templates/service.yaml

@@ -10,6 +10,7 @@ metadata:
     helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
   name: {{ template "nginx.fullname" . }}
 spec:
 # Provides options for the service so chart users have the full choice

pkg/chartutil/create.go

@@ -159,6 +159,7 @@ metadata:
     app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
     helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- with .Values.ingress.annotations }}
   annotations:
@@ -193,30 +194,15 @@ kind: Deployment
 metadata:
   name: {{ template "<CHARTNAME>.fullname" . }}
   labels:
-<<<<<<< HEAD
-    app: {{ template "<CHARTNAME>.name" . }}
-    chart: {{ template "<CHARTNAME>.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-=======
     app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
     helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
->>>>>>> e328d00a... Updating to the k8s label convention
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-<<<<<<< HEAD
-      app: {{ template "<CHARTNAME>.name" . }}
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: {{ template "<CHARTNAME>.name" . }}
-        release: {{ .Release.Name }}
-=======
       app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
   template:
@@ -224,7 +210,6 @@ spec:
       labels:
         app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
         app.kubernetes.io/instance: {{ .Release.Name }}
->>>>>>> e328d00a... Updating to the k8s label convention
     spec:
       containers:
         - name: {{ .Chart.Name }}
@@ -263,17 +248,11 @@ kind: Service
 metadata:
   name: {{ template "<CHARTNAME>.fullname" . }}
   labels:
-<<<<<<< HEAD
-    app: {{ template "<CHARTNAME>.name" . }}
-    chart: {{ template "<CHARTNAME>.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-=======
     app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
     helm.sh/chart: {{ include "<CHARTNAME>.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
->>>>>>> e328d00a... Updating to the k8s label convention
 spec:
   type: {{ .Values.service.type }}
   ports:
@@ -282,13 +261,8 @@ spec:
       protocol: TCP
       name: http
   selector:
-<<<<<<< HEAD
-    app: {{ template "<CHARTNAME>.name" . }}
-    release: {{ .Release.Name }}
-=======
     app.kubernetes.io/name: {{ include "<CHARTNAME>.name" . }}
-    app.kubernetes.io/instancelease: {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
->>>>>>> e328d00a... Updating to the k8s label convention
 `
 
 const defaultNotes = `1. Get the application URL by running these commands:

pkg/lint/rules/testdata/albatross/templates/svc.yaml

@@ -7,6 +7,7 @@ metadata:
   labels:
     app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
     app.kubernetes.io/instance: {{ .Release.Name | quote }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
     helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
     kubeVersion: {{ .Capabilities.KubeVersion.Major }}
 spec: