update
diff --git a/charts/cert-manager/templates/cainjector-deployment.yaml b/charts/cert-manager/templates/cainjector-deployment.yaml
index 1220173..6b097f0 100644
--- a/charts/cert-manager/templates/cainjector-deployment.yaml
+++ b/charts/cert-manager/templates/cainjector-deployment.yaml
@@ -16,6 +16,10 @@
{{- end }}
spec:
replicas: {{ .Values.cainjector.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: {{ include "cainjector.name" . }}
@@ -40,28 +44,48 @@
annotations:
{{- toYaml . | nindent 8 }}
{{- end }}
+ {{- if and .Values.prometheus.enabled (not (or .Values.prometheus.servicemonitor.enabled .Values.prometheus.podmonitor.enabled)) }}
+ {{- if not .Values.cainjector.podAnnotations }}
+ annotations:
+ {{- end }}
+ prometheus.io/path: "/metrics"
+ prometheus.io/scrape: 'true'
+ prometheus.io/port: '9402'
+ {{- end }}
spec:
+ {{- if not .Values.cainjector.serviceAccount.create }}
+ {{- with .Values.global.imagePullSecrets }}
+ imagePullSecrets:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- end }}
serviceAccountName: {{ template "cainjector.serviceAccountName" . }}
{{- if hasKey .Values.cainjector "automountServiceAccountToken" }}
automountServiceAccountToken: {{ .Values.cainjector.automountServiceAccountToken }}
{{- end }}
+ enableServiceLinks: {{ .Values.cainjector.enableServiceLinks }}
{{- with .Values.global.priorityClassName }}
priorityClassName: {{ . | quote }}
{{- end }}
+ {{- if (hasKey .Values.global "hostUsers") }}
+ hostUsers: {{ .Values.global.hostUsers }}
+ {{- end }}
{{- with .Values.cainjector.securityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
{{- end }}
containers:
- name: {{ .Chart.Name }}-cainjector
- {{- with .Values.cainjector.image }}
- image: "{{- if .registry -}}{{ .registry }}/{{- end -}}{{ .repository }}{{- if (.digest) -}} @{{ .digest }}{{- else -}}:{{ default $.Chart.AppVersion .tag }} {{- end -}}"
- {{- end }}
+ image: "{{ template "cert-manager.image" (tuple .Values.cainjector.image .Values.imageRegistry .Values.imageNamespace (printf ":%s" .Chart.AppVersion)) }}"
imagePullPolicy: {{ .Values.cainjector.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.cainjector.config }}
+ - --config=/var/cert-manager/config/config.yaml
+ {{- end }}
{{- with .Values.global.leaderElection }}
- --leader-election-namespace={{ .namespace }}
{{- if .leaseDuration }}
@@ -74,14 +98,29 @@
- --leader-election-retry-period={{ .retryPeriod }}
{{- end }}
{{- end }}
+ {{- with .Values.cainjector.featureGates}}
+ - --feature-gates={{ . }}
+ {{- end}}
{{- with .Values.cainjector.extraArgs }}
{{- toYaml . | nindent 10 }}
{{- end }}
+ {{- if not .Values.prometheus.enabled }}
+ - --metrics-listen-address=0
+ {{- end }}
+ {{- if .Values.prometheus.enabled }}
+ ports:
+ - containerPort: 9402
+ name: http-metrics
+ protocol: TCP
+ {{- end }}
env:
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
+ {{- with .Values.cainjector.extraEnv }}
+ {{- toYaml . | nindent 10 }}
+ {{- end }}
{{- with .Values.cainjector.containerSecurityContext }}
securityContext:
{{- toYaml . | nindent 12 }}
@@ -90,18 +129,33 @@
resources:
{{- toYaml . | nindent 12 }}
{{- end }}
- {{- with .Values.cainjector.volumeMounts }}
+ {{- if or .Values.cainjector.config .Values.cainjector.volumeMounts }}
volumeMounts:
+ {{- if .Values.cainjector.config }}
+ - name: config
+ mountPath: /var/cert-manager/config
+ {{- end }}
+ {{- with .Values.cainjector.volumeMounts }}
{{- toYaml . | nindent 12 }}
+ {{- end }}
{{- end }}
- {{- with .Values.cainjector.nodeSelector }}
+ {{- $nodeSelector := .Values.global.nodeSelector | default dict }}
+ {{- $nodeSelector = merge $nodeSelector (.Values.cainjector.nodeSelector | default dict) }}
+ {{- with $nodeSelector }}
nodeSelector:
- {{- toYaml . | nindent 8 }}
+ {{- range $key, $value := . }}
+ {{ $key }}: {{ $value | quote }}
+ {{- end }}
{{- end }}
{{- with .Values.cainjector.affinity }}
affinity:
{{- toYaml . | nindent 8 }}
{{- end }}
+ {{- if .Values.cainjector.runtimeClassName }}
+ runtimeClassName: {{ .Values.cainjector.runtimeClassName | quote }}
+ {{- else if .Values.global.runtimeClassName }}
+ runtimeClassName: {{ .Values.global.runtimeClassName | quote }}
+ {{- end }}
{{- with .Values.cainjector.tolerations }}
tolerations:
{{- toYaml . | nindent 8 }}
@@ -110,8 +164,15 @@
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
- {{- with .Values.cainjector.volumes }}
+ {{- if or .Values.cainjector.volumes .Values.cainjector.config }}
volumes:
+ {{- if .Values.cainjector.config }}
+ - name: config
+ configMap:
+ name: {{ include "cainjector.fullname" . }}
+ {{- end }}
+ {{ with .Values.cainjector.volumes }}
{{- toYaml . | nindent 8 }}
+ {{- end }}
{{- end }}
{{- end }}