update
diff --git a/charts/cert-manager/templates/_helpers.tpl b/charts/cert-manager/templates/_helpers.tpl
index 90db4af..83d844f 100644
--- a/charts/cert-manager/templates/_helpers.tpl
+++ b/charts/cert-manager/templates/_helpers.tpl
@@ -152,7 +152,7 @@
*/}}
{{- define "labels" -}}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-{{- if eq (default "helm" .Values.creator) "helm" }}
+{{- if eq .Values.creator "helm" }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "chartName" . }}
{{- end -}}
@@ -172,3 +172,96 @@
{{- define "cert-manager.namespace" -}}
{{ .Values.namespace | default .Release.Namespace }}
{{- end -}}
+
+{{/*
+Util function for generating the image URL based on the provided options.
+IMPORTANT: This function is standardized across all charts in the cert-manager GH organization.
+Any changes to this function should also be made in cert-manager, trust-manager, approver-policy, ...
+See https://github.com/cert-manager/cert-manager/issues/6329 for a list of linked PRs.
+*/}}
+{{- define "cert-manager.image" -}}
+{{- /*
+Calling convention:
+
+- (tuple <imageValues> <imageRegistry> <imageNamespace> <defaultReference>)
+
+We intentionally pass imageRegistry/imageNamespace as explicit arguments rather than reading
+from `.Values` inside this helper, because `helm-tool lint` does not reliably track `.Values.*`
+usage through tuple/variable indirection.
+*/ -}}
+
+{{- if ne (len .) 4 -}}
+ {{- fail (printf "ERROR: template \"cert-manager.image\" expects (tuple <imageValues> <imageRegistry> <imageNamespace> <defaultReference>), got %d arguments" (len .)) -}}
+{{- end -}}
+
+{{- $image := index . 0 -}}
+{{- $imageRegistry := index . 1 | default "" -}}
+{{- $imageNamespace := index . 2 | default "" -}}
+{{- $defaultReference := index . 3 -}}
+
+{{- $repository := "" -}}
+{{- if $image.repository -}}
+ {{- $repository = $image.repository -}}
+
+ {{- /*
+ Backwards compatibility: if image.registry is set, additionally prefix the repository with this registry.
+ */ -}}
+ {{- if $image.registry -}}
+ {{- $repository = printf "%s/%s" $image.registry $repository -}}
+ {{- end -}}
+{{- else -}}
+ {{- $name := required "ERROR: image.name must be set when image.repository is empty" $image.name -}}
+ {{- $repository = $name -}}
+
+ {{- if $imageNamespace -}}
+ {{- $repository = printf "%s/%s" $imageNamespace $repository -}}
+ {{- end -}}
+
+ {{- if $imageRegistry -}}
+ {{- $repository = printf "%s/%s" $imageRegistry $repository -}}
+ {{- end -}}
+
+ {{- /*
+ Backwards compatibility: if image.registry is set, additionally prefix the repository with this registry.
+ */ -}}
+ {{- if $image.registry -}}
+ {{- $repository = printf "%s/%s" $image.registry $repository -}}
+ {{- end -}}
+{{- end -}}
+
+{{- $repository -}}
+{{- if and $image.tag $image.digest -}}
+ {{- printf ":%s@%s" $image.tag $image.digest -}}
+{{- else if $image.tag -}}
+ {{- printf ":%s" $image.tag -}}
+{{- else if $image.digest -}}
+ {{- printf "@%s" $image.digest -}}
+{{- else -}}
+ {{- printf "%s" $defaultReference -}}
+{{- end -}}
+{{- end }}
+
+{{/*
+Labels for the CRD resources.
+*/}}
+{{- define "cert-manager.crd-labels" -}}
+app: "{{ template "cert-manager.name" . }}"
+app.kubernetes.io/name: "{{ template "cert-manager.name" . }}"
+app.kubernetes.io/instance: "{{ .Release.Name }}"
+app.kubernetes.io/component: "crds"
+{{ include "labels" . }}
+{{- end -}}
+
+{{/*
+Check that the user has not set both .installCRDs and .crds.enabled or
+set .installCRDs and disabled .crds.keep.
+.installCRDs is deprecated and users should use .crds.enabled and .crds.keep instead.
+*/}}
+{{- define "cert-manager.crd-check" -}}
+ {{- if and (.Values.installCRDs) (.Values.crds.enabled) }}
+ {{- fail "ERROR: the deprecated .installCRDs option cannot be enabled at the same time as its replacement .crds.enabled" }}
+ {{- end }}
+ {{- if and (.Values.installCRDs) (not .Values.crds.keep) }}
+ {{- fail "ERROR: .crds.keep is not compatible with .installCRDs, please use .crds.enabled and .crds.keep instead" }}
+ {{- end }}
+{{- end -}}