cert-manager: 1.19.6 -> 1.20.3
Change-Id: Iabb070751250884fca8064f8b27d0a86a63959af
diff --git a/charts/cert-manager/templates/deployment.yaml b/charts/cert-manager/templates/deployment.yaml
index 453e823..c4d267a 100644
--- a/charts/cert-manager/templates/deployment.yaml
+++ b/charts/cert-manager/templates/deployment.yaml
@@ -67,7 +67,7 @@
priorityClassName: {{ . | quote }}
{{- end }}
{{- if (hasKey .Values.global "hostUsers") }}
- hostUsers: {{ .Values.global.hostUsers }}
+ hostUsers: {{ .Values.global.hostUsers }}
{{- end }}
{{- with .Values.securityContext }}
securityContext:
@@ -76,8 +76,8 @@
{{- if or .Values.volumes .Values.config}}
volumes:
{{- if .Values.config }}
- - name: config
- configMap:
+ - name: config
+ configMap:
name: {{ include "cert-manager.fullname" . }}
{{- end }}
{{ with .Values.volumes }}
@@ -86,7 +86,7 @@
{{- end }}
containers:
- name: {{ .Chart.Name }}-controller
- image: "{{ template "image" (tuple .Values.image $.Chart.AppVersion) }}"
+ image: "{{ template "image" (tuple .Values.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
{{- /* The if statement below is equivalent to {{- if $value }} but will also return true for 0. */ -}}
@@ -114,9 +114,7 @@
- --leader-election-retry-period={{ .retryPeriod }}
{{- end }}
{{- end }}
- {{- with .Values.acmesolver.image }}
- - --acme-http01-solver-image={{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}
- {{- end }}
+ - --acme-http01-solver-image={{ template "image" (tuple .Values.acmesolver.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}
{{- with .Values.extraArgs }}
{{- toYaml . | nindent 10 }}
{{- end }}
@@ -163,7 +161,7 @@
{{- if or .Values.config .Values.volumeMounts }}
volumeMounts:
{{- if .Values.config }}
- - name: config
+ - name: config
mountPath: /var/cert-manager/config
{{- end }}
{{- with .Values.volumeMounts }}
@@ -212,6 +210,9 @@
failureThreshold: {{ .failureThreshold }}
{{- end }}
{{- end }}
+ {{- if .Values.extraContainers }}
+ {{- toYaml .Values.extraContainers | nindent 8 }}
+ {{- end }}
{{- $nodeSelector := .Values.global.nodeSelector | default dict }}
{{- $nodeSelector = merge $nodeSelector (.Values.nodeSelector | default dict) }}
{{- with $nodeSelector }}