Improve common image template (#314)

netbox-community · Aug 21, 2024 · bf318aa · bf318aa
1 parent 7e8a26a
commit bf318aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/charts/netbox/Chart.yaml b/charts/netbox/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: netbox
-version: 5.0.0-beta.79
+version: 5.0.0-beta.80
 appVersion: "v4.0.9"
 type: application
 kubeVersion: ^1.25.0-0

diff --git a/charts/netbox/templates/_helpers.tpl b/charts/netbox/templates/_helpers.tpl
@@ -4,12 +4,7 @@
 Return the proper image name
 */}}
 {{- define "netbox.image" -}}
-{{- $imageRoot := .Values.image -}}
-{{- if not .Values.image.tag }}
-    {{- $tag := (dict "tag" .Chart.AppVersion) -}}
-    {{- $imageRoot := merge .Values.image $tag -}}
-{{- end -}}
-{{- include "common.images.image" (dict "imageRoot" $imageRoot "global" .Values.global) -}}
+{{- include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart) -}}
 {{- end -}}
 
 {{/*