Adjust chart so that it will work with version updater

excalq · Apr 13, 2023 · 3efbe07 · 3efbe07
1 parent d95f858
commit 3efbe07
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: logstash-exporter
 description: Prometheus exporter for Logstash written in Go
 type: application
-version: v1.0.2
-appVersion: 1.0.2
+version: "1.0.2"
+appVersion: "1.0.2"
diff --git a/chart/README.md b/chart/README.md
@@ -10,12 +10,12 @@
 
 ### Image settings
 
-| Name               | Description                        | Value                        |
-| ------------------ | ---------------------------------- | ---------------------------- |
-| `image.repository` | Image repository                   | `kuskoman/logstash-exporter` |
-| `image.tag`        | Image tag                          | `v1.0.2`                     |
-| `image.pullPolicy` | Image pull policy                  | `IfNotPresent`               |
-| `fullnameOverride` | Override the fullname of the chart | `""`                         |
+| Name               | Description                                  | Value                        |
+| ------------------ | -------------------------------------------- | ---------------------------- |
+| `image.repository` | Image repository                             | `kuskoman/logstash-exporter` |
+| `image.tag`        | Image tag, if not set the appVersion is used | `""`                         |
+| `image.pullPolicy` | Image pull policy                            | `IfNotPresent`               |
+| `fullnameOverride` | Override the fullname of the chart           | `""`                         |
 
 ### Deployment settings
 

diff --git a/chart/schema.json b/chart/schema.json
@@ -22,8 +22,8 @@
                 },
                 "tag": {
                     "type": "string",
-                    "description": "Image tag",
-                    "default": "v1.0.2"
+                    "description": "Image tag, if not set the appVersion is used",
+                    "default": ""
                 },
                 "pullPolicy": {
                     "type": "string",

diff --git a/chart/templates/_helpers.tpl b/chart/templates/_helpers.tpl
@@ -19,11 +19,23 @@ If release name contains chart name it will be used as a full name.
 {{- printf "%s" .Chart.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
-{{- define "logstash-exporter.serviceAccountName" -}}
 {{/*
 By default we want service account name to be the same as fullname
 but this may change in the future, so for easier usage this is extracted
 to a separate template.
 */}}
+{{- define "logstash-exporter.serviceAccountName" -}}
 {{- include "logstash-exporter.fullname" . }}
 {{- end -}}
+
+{{/*
+logstash-exporter.imageTag is a named template that returns the image tag.
+It checks if .Values.image.tag is provided, and if not, it returns a tag with "v" prefix followed by the app version from the Chart.yaml.
+*/}}
+{{- define "logstash-exporter.imageTag" -}}
+{{- if .Values.image.tag -}}
+{{- .Values.image.tag -}}
+{{- else -}}
+{{- printf "v%s" .Chart.AppVersion -}}
+{{- end -}}
+{{- end -}}
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
@@ -98,7 +98,7 @@ spec:
           valueFrom:
             {{- toYaml $value | nindent 14 }}
         {{- end }}
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ include "logstash-exporter.imageTag" $ }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
 
         {{- if .Values.deployment.resources }}

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -11,9 +11,9 @@ image:
   ## @param image.repository Image repository
   ##
   repository: "kuskoman/logstash-exporter"
-  ## @param image.tag Image tag
+  ## @param image.tag Image tag, if not set the appVersion is used
   ##
-  tag: "v1.0.2"
+  tag: ""
   ## @param image.pullPolicy Image pull policy
   ## Options: Always, Never, IfNotPresent
   ##