cert-manager: upgrade from 1.12.17 to 1.17.4
Change-Id: Iea0d6eac22a57f9f1fc522e6abdd9359fbbd1415
diff --git a/charts/cert-manager/templates/deployment.yaml b/charts/cert-manager/templates/deployment.yaml
index aea5736..8a4a973 100644
--- a/charts/cert-manager/templates/deployment.yaml
+++ b/charts/cert-manager/templates/deployment.yaml
@@ -15,6 +15,10 @@
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
+ {{- /* The if statement below is equivalent to {{- if $value }} but will also return true for 0. */ -}}
+ {{- if not (has (quote .Values.global.revisionHistoryLimit) (list "" (quote ""))) }}
+ revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
+ {{- end }}
selector:
matchLabels:
app.kubernetes.io/name: {{ template "cert-manager.name" . }}
@@ -39,7 +43,7 @@
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- if and .Values.prometheus.enabled (not .Values.prometheus.servicemonitor.enabled) }}
+ {{- if and .Values.prometheus.enabled (not (or .Values.prometheus.servicemonitor.enabled .Values.prometheus.podmonitor.enabled)) }}
{{- if not .Values.podAnnotations }}
annotations:
{{- end }}
@@ -48,10 +52,17 @@
prometheus.io/port: '9402'
{{- end }}
spec:
+ {{- if not .Values.serviceAccount.create }}
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- end }}
serviceAccountName: {{ template "cert-manager.serviceAccountName" . }}
{{- if hasKey .Values "automountServiceAccountToken" }}
automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
{{- end }}
+ enableServiceLinks: {{ .Values.enableServiceLinks }}
{{- with .Values.global.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}
@@ -59,20 +70,30 @@
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.volumes }}
+ {{- if or .Values.volumes .Values.config}}
volumes:
+ {{- if .Values.config }}
+ - name: config
+ configMap:
+ name: {{ include "cert-manager.fullname" . }}
+ {{- end }}
+ {{ with .Values.volumes }}
{{- toYaml . | nindent 8 }}
+ {{- end }}
{{- end }}
containers:
- name: {{ .Chart.Name }}-controller
- {{- with .Values.image }}
- image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
- {{- end }}
+ image: "{{ template "image" (tuple .Values.image $.Chart.AppVersion) }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
- {{- if .Values.global.logLevel }}
+ {{- /* The if statement below is equivalent to {{- if $value }} but will also return true for 0. */ -}}
+ {{- if not (has (quote .Values.global.logLevel) (list "" (quote ""))) }}
- --v={{ .Values.global.logLevel }}
{{- end }}
+ {{- if .Values.config }}
+ - --config=/var/cert-manager/config/config.yaml
+ {{- end }}
+ {{- $config := default .Values.config "" }}
{{- if .Values.clusterResourceNamespace }}
- --cluster-resource-namespace={{ .Values.clusterResourceNamespace }}
{{- else }}
@@ -122,6 +143,9 @@
{{- with .Values.dns01RecursiveNameservers }}
- --dns01-recursive-nameservers={{ . }}
{{- end }}
+ {{- if .Values.disableAutoApproval }}
+ - --controllers=-certificaterequests-approver
+ {{- end }}
ports:
- containerPort: 9402
name: http-metrics
@@ -133,9 +157,15 @@
securityContext:
{{- toYaml . | nindent 12 }}
{{- end }}
- {{- with .Values.volumeMounts }}
+ {{- if or .Values.config .Values.volumeMounts }}
volumeMounts:
+ {{- if .Values.config }}
+ - name: config
+ mountPath: /var/cert-manager/config
+ {{- end }}
+ {{- with .Values.volumeMounts }}
{{- toYaml . | nindent 12 }}
+ {{- end }}
{{- end }}
env:
- name: POD_NAMESPACE
@@ -202,3 +232,6 @@
dnsConfig:
{{- toYaml . | nindent 8 }}
{{- end }}
+ {{- with .Values.hostAliases }}
+ hostAliases: {{ toYaml . | nindent 8 }}
+ {{- end }}
\ No newline at end of file