helm: set correct appVersion and default image tags to it

AnalogJ · Sep 3, 2022 · ad8522b · ad8522b
1 parent 934e310
commit ad8522b
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/charts/scrutiny/Chart.yaml b/charts/scrutiny/Chart.yaml
@@ -17,12 +17,6 @@ type: application
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.1.0
 
-# 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.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
-
 dependencies:
   - name: influxdb2
     version: 2.1.0

diff --git a/charts/scrutiny/charts/collector/Chart.yaml b/charts/scrutiny/charts/collector/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "v0.5.0"
diff --git a/charts/scrutiny/charts/collector/templates/daemonset.yaml b/charts/scrutiny/charts/collector/templates/daemonset.yaml
@@ -28,7 +28,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "%s-collector" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:

diff --git a/charts/scrutiny/charts/collector/values.yaml b/charts/scrutiny/charts/collector/values.yaml
@@ -9,7 +9,8 @@ image:
   repository: ghcr.io/analogj/scrutiny
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: master-collector
+  # Should contain the -collector suffix, e.g. "v0.5.0-collector"
+  tag:
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/charts/scrutiny/charts/web/Chart.yaml b/charts/scrutiny/charts/web/Chart.yaml
@@ -21,4 +21,4 @@ version: 0.1.0
 # 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.
 # It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "v0.5.0"
diff --git a/charts/scrutiny/charts/web/templates/deployment.yaml b/charts/scrutiny/charts/web/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default (printf "%s-web" .Chart.AppVersion) }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

diff --git a/charts/scrutiny/charts/web/values.yaml b/charts/scrutiny/charts/web/values.yaml
@@ -14,7 +14,8 @@ image:
   repository: ghcr.io/analogj/scrutiny
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: master-web
+  # Should contain the -web suffix, e.g. "v0.5.0-web"
+  tag:
 
 imagePullSecrets: []
 nameOverride: ""