add app.kubernetes.io/version label

Author: cognifloyd

templates/_helpers.tpl

@@ -12,6 +12,8 @@ Usage: "{{ include "stackstorm-ha.labels" (list $ "st2servicename") }}"
 {{- define "stackstorm-ha.labels" -}}
 {{- $root := index . 0 }}
 {{- $name := index . 1 }}
+{{- $valuesKey := regexReplaceAll "-.*" $name "" }}
+{{- $appVersion := dig $valuesKey "image" "tag" ($root.Values.image.tag) ($root.Values|merge (dict)) }}
 {{ include "stackstorm-ha.selectorLabels" . }}
 {{- if list "st2web" "ingress" | has $name }}
 app.kubernetes.io/component: frontend
@@ -21,6 +23,7 @@ app.kubernetes.io/component: tests
 app.kubernetes.io/component: backend
 {{- end }}
 app.kubernetes.io/part-of: stackstorm
+app.kubernetes.io/version: {{ tpl $appVersion $root | quote }}
 helm.sh/chart: {{ $root.Chart.Name }}-{{ $root.Chart.Version }}
 app.kubernetes.io/managed-by: {{ $root.Release.Service }}
 {{- end -}}

tests/unit/labels_test.yaml

@@ -27,12 +27,14 @@ templates:
 
 release:
   name: some-release-name
-chart:
+chart: &chart # workaround for bug where top-level appVersion does not take affect
   version: 1.0.999
+  appVersion: &appVersion "3.999"
 
 tests:
   - it: Deployments+Pods have requried labels
     template: deployments.yaml
+    chart: *chart
     set:
       st2: { packs: { sensors: [] } } # ensure only 1 sensor
       st2chatops:
@@ -85,6 +87,13 @@ tests:
           path: spec.template.metadata.labels.[app.kubernetes.io/part-of]
           value: stackstorm
 
+      - equal:
+          path: metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
+      - equal:
+          path: spec.template.metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
+
       - equal:
           path: metadata.labels.[helm.sh/chart]
           value: stackstorm-ha-1.0.999
@@ -101,6 +110,7 @@ tests:
 
   - it: Jobs+Pods have requried labels
     template: jobs.yaml
+    chart: *chart
     set:
       st2:
         rbac:
@@ -151,6 +161,13 @@ tests:
           path: spec.template.metadata.labels.[app.kubernetes.io/part-of]
           value: stackstorm
 
+      - equal:
+          path: metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
+      - equal:
+          path: spec.template.metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
+
       - equal:
           path: metadata.labels.[helm.sh/chart]
           value: stackstorm-ha-1.0.999
@@ -167,6 +184,7 @@ tests:
 
   - it: Services have required labels
     template: services.yaml
+    chart: *chart
     set:
       st2chatops:
         enabled: true
@@ -186,6 +204,9 @@ tests:
       - equal:
           path: metadata.labels.[app.kubernetes.io/part-of]
           value: stackstorm
+      - equal:
+          path: metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
       - equal:
           path: metadata.labels.[helm.sh/chart]
           value: stackstorm-ha-1.0.999
@@ -195,6 +216,7 @@ tests:
 
   - it: ServiceAccount has required labels
     template: service-account.yaml
+    chart: *chart
     set:
       serviceAccount:
         create: true
@@ -213,6 +235,9 @@ tests:
       - equal:
           path: metadata.labels.[app.kubernetes.io/part-of]
           value: stackstorm
+      - equal:
+          path: metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
       - equal:
           path: metadata.labels.[helm.sh/chart]
           value: stackstorm-ha-1.0.999
@@ -240,6 +265,7 @@ tests:
 
   - it: st2web Ingress has required labels
     template: ingress.yaml
+    chart: *chart
     set:
       st2web:
         service:
@@ -261,6 +287,9 @@ tests:
       - equal:
           path: metadata.labels.[app.kubernetes.io/part-of]
           value: stackstorm
+      - equal:
+          path: metadata.labels.[app.kubernetes.io/version]
+          value: *appVersion
       - equal:
           path: metadata.labels.[helm.sh/chart]
           value: stackstorm-ha-1.0.999