adapt chart

Signed-off-by: Charles-Edouard Brétéché <[email protected]>
nirmata · Nov 30, 2022 · e88269d · e88269d
1 parent 61ef0d1
commit e88269d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/charts/kyverno-aws-adapter/Chart.yaml b/charts/kyverno-aws-adapter/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: kyverno-aws-adapter
 description: Helm chart for the Kyverno AWS Adapter
 type: application
-version: 0.1.0
-appVersion: 0.1.0
+version: v0.0.1
+appVersion: v0.0.1
 keywords:
   - kubernetes
   - nirmata

diff --git a/charts/kyverno-aws-adapter/templates/_helpers.tpl b/charts/kyverno-aws-adapter/templates/_helpers.tpl
@@ -66,3 +66,7 @@ Generate the dockerconfigjson value
 {{- $user_pwd_hashed := printf "%s:%s" .Values.registryConfig.username .Values.registryConfig.password | b64enc }}
 {{- printf "{\"auths\":{\"ghcr.io\":{\"auth\":\"%s\"}}}" $user_pwd_hashed | b64enc }}
 {{- end }}
+
+{{- define "kyverno-aws-adapter.image" -}}
+{{ printf "%s:%s" (required "An image repository is required" .Values.image.repository) (default .Chart.AppVersion .Values.image.tag) }}
+{{- end }}
diff --git a/charts/kyverno-aws-adapter/templates/deployment.yaml b/charts/kyverno-aws-adapter/templates/deployment.yaml
@@ -28,7 +28,7 @@ spec:
       containers:
       - command:
         - /manager
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+        image: {{ include "kyverno-aws-adapter.image" . }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: manager
         {{- if .Values.pollInterval }}

diff --git a/charts/kyverno-aws-adapter/values.yaml b/charts/kyverno-aws-adapter/values.yaml
@@ -39,5 +39,5 @@ image:
   repository: ghcr.io/nirmata/kyverno-aws-adapter
   # -- Image pull policy
   pullPolicy: Always
-  # -- Image tag
-  tag: latest
+  # -- Image tag (defaults to chart app version)
+  tag: