Allow for having no registry specified (#312)
This commit is contained in:
@@ -32,9 +32,9 @@
|
|||||||
|
|
||||||
{{- define "spire-lib.registry" }}
|
{{- define "spire-lib.registry" }}
|
||||||
{{- if ne (len (dig "spire" "image" "registry" "" .global)) 0 }}
|
{{- if ne (len (dig "spire" "image" "registry" "" .global)) 0 }}
|
||||||
{{- .global.spire.image.registry }}
|
{{- print .global.spire.image.registry "/"}}
|
||||||
{{- else }}
|
{{- else if ne (len (.image.registry)) 0 }}
|
||||||
{{- .image.registry }}
|
{{- print .image.registry "/"}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
@@ -45,11 +45,11 @@
|
|||||||
{{- if eq (substr 0 7 $tag) "sha256:" }}
|
{{- if eq (substr 0 7 $tag) "sha256:" }}
|
||||||
{{- printf "%s/%s@%s" $registry $repo $tag }}
|
{{- printf "%s/%s@%s" $registry $repo $tag }}
|
||||||
{{- else if .appVersion }}
|
{{- else if .appVersion }}
|
||||||
{{- printf "%s/%s:%s" $registry $repo (default .appVersion $tag) }}
|
{{- printf "%s%s:%s" $registry $repo (default .appVersion $tag) }}
|
||||||
{{- else if $tag }}
|
{{- else if $tag }}
|
||||||
{{- printf "%s/%s:%s" $registry $repo $tag }}
|
{{- printf "%s%s:%s" $registry $repo $tag }}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
{{- printf "%s/%s" $registry $repo }}
|
{{- printf "%s%s" $registry $repo }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user