Allow for having no registry specified (#312)

spiffe · May 25, 2023 · 3cb55df · 3cb55df
1 parent 1247b68
commit 3cb55df
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/charts/spire/templates/_spire-lib.tpl b/charts/spire/templates/_spire-lib.tpl
@@ -32,9 +32,9 @@
 
 {{- define "spire-lib.registry" }}
 {{- if ne (len (dig "spire" "image" "registry" "" .global)) 0 }}
-{{- .global.spire.image.registry }}
-{{- else }}
-{{- .image.registry }}
+{{- print .global.spire.image.registry "/"}}
+{{- else if ne (len (.image.registry)) 0 }}
+{{- print .image.registry "/"}}
 {{- end }}
 {{- end }}
 
@@ -45,11 +45,11 @@
 {{- if eq (substr 0 7 $tag) "sha256:" }}
 {{- printf "%s/%s@%s" $registry $repo $tag }}
 {{- else if .appVersion }}
-{{- printf "%s/%s:%s" $registry $repo (default .appVersion $tag) }}
+{{- printf "%s%s:%s" $registry $repo (default .appVersion $tag) }}
 {{- else if $tag }}
-{{- printf "%s/%s:%s" $registry $repo $tag }}
+{{- printf "%s%s:%s" $registry $repo $tag }}
 {{- else }}
-{{- printf "%s/%s" $registry $repo }}
+{{- printf "%s%s" $registry $repo }}
 {{- end }}
 {{- end }}