Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/registry/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: registry
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.3.0
version: 1.3.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
Expand Down
5 changes: 3 additions & 2 deletions charts/registry/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,12 @@ Create the name of the service account to use

{{/*
Util function for generating the image URL based on the provided options.
Either image.tag or image.digest must be set explicitly; no fallback to appVersion.
*/}}
{{- define "registry.image" -}}
{{- $defaultTag := index . 1 -}}
{{- with index . 0 -}}
{{- if not (or .digest .tag) -}}{{ fail "Either image.tag or image.digest must be set" }}{{- end -}}
{{- if .registry -}}{{ printf "%s/%s" .registry .repository }}{{- else -}}{{- .repository -}}{{- end -}}
{{- if .digest -}}{{ printf "@%s" .digest }}{{- else -}}{{ printf ":%s" (default $defaultTag .tag) }}{{- end -}}
{{- if .digest -}}{{ printf "@%s" .digest }}{{- else -}}{{ printf ":%s" .tag }}{{- end -}}
{{- end }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/registry/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
image: "{{ template "registry.image" (tuple .Values.image $.Chart.AppVersion) }}"
image: "{{ template "registry.image" (tuple .Values.image) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- with .Values.image.command }}
command: ["{{- toYaml . }}"]
Expand Down
1 change: 0 additions & 1 deletion charts/registry/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ image:
repository: images/registry

# Override the image tag to deploy by setting this variable.
# If no value is set, the chart's appVersion is used.
# +docs:property
# tag: 0.0.1

Expand Down
Loading