Merge pull request #17 from yellowhat/main

Use appVersion as image.tag
sustainable-computing-io · May 1, 2023 · f4769b7 · f4769b7
2 parents 440b066 + 756b71c
commit f4769b7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/chart/kepler/Chart.yaml b/chart/kepler/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kepler
 description: A Helm chart for kepler
 type: application
-version: 0.3.2
-appVersion: 0.4.0
+version: 0.3.3
+appVersion: latest
 home: https://sustainable-computing.io/html/index.html
 sources:
   - https://github.com/sustainable-computing-io/kepler
diff --git a/chart/kepler/templates/server.yaml b/chart/kepler/templates/server.yaml
@@ -22,7 +22,7 @@ spec:
       serviceAccountName: {{ include "kepler.serviceAccountName" . }}
       containers:
       - name: kepler-exporter
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}

diff --git a/chart/kepler/values.yaml b/chart/kepler/values.yaml
@@ -1,9 +1,11 @@
 ---
 image:
-  repository: quay.io/sustainable_computing_io/kepler
+  # -- Repository to pull the image from
+  repository: "quay.io/sustainable_computing_io/kepler"
+  # -- Image tag, if empty it will get it from the chart's appVersion
+  tag: ""
+  # -- Pull policy
   pullPolicy: Always
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: "latest"
 
 imagePullSecrets: []
 nameOverride: ""