Merge branch 'feat/add-version-overrides' into 'main'

Add app+chart version overrides

See merge request henrywhitaker3/generic-helm-chart!3

chart/Chart.yaml

@@ -13,7 +13,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.2
+version: 1.3.3
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

chart/templates/_helpers.tpl

@@ -27,7 +27,7 @@ If release name contains chart name it will be used as a full name.
 Create chart name and version as used by the chart label.
 */}}
 {{- define "generic.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
+{{- printf "%s-%s" .Chart.Name (default .Chart.Version .Values.versionOverride) | replace "+" "_" | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -36,8 +36,8 @@ Common labels
 {{- define "generic.labels" -}}
 helm.sh/chart: {{ include "generic.chart" . }}
 {{ include "generic.selectorLabels" . }}
-{{- if .Chart.AppVersion }}
-app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- if  or (.Chart.AppVersion) (.Values.appVersionOverride) }}
+app.kubernetes.io/version: {{ default .Chart.AppVersion .Values.appVersionOverride | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}

chart/tests/deployment_test.yaml

@@ -353,3 +353,26 @@ tests:
           path: .spec.template.spec.containers[0].readinessProbe.exec.command
           content:
             tail
+  - it: sets the app version according to the chart
+    chart:
+      version: "1.3.2"
+      appVersion: "1.16.0"
+    asserts:
+      - isSubset:
+          path: .metadata.labels
+          content:
+            helm.sh/chart: generic-1.3.2
+            app.kubernetes.io/version: "1.16.0"
+  - it: sets the app version according to the overrides
+    chart:
+      version: 1.3.2
+      appVersion: "1.16.0"
+    set:
+      versionOverride: 11.0.0
+      appVersionOverride: "2.0.0"
+    asserts:
+      - isSubset:
+          path: .metadata.labels
+          content:
+            helm.sh/chart: generic-11.0.0
+            app.kubernetes.io/version: "2.0.0"

chart/values.yaml

@@ -5,6 +5,11 @@
 nameOverride: ""
 fullnameOverride: ""
 
+# Override the chart version
+versionOverride: ""
+# Override the app version
+appVersionOverride: ""
+
 replicaCount: 1
 
 image: