From 469422872ed2fd7027a4cd9615a56a57b8c9a739 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Fri, 25 Oct 2019 12:10:42 +0100
Subject: [PATCH 1/3] Simplify the way webhook component names are computed

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 .../cert-manager/templates/_helpers.tpl       | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/deploy/charts/cert-manager/templates/_helpers.tpl b/deploy/charts/cert-manager/templates/_helpers.tpl
index b116334bb..260bdf86c 100644
--- a/deploy/charts/cert-manager/templates/_helpers.tpl
+++ b/deploy/charts/cert-manager/templates/_helpers.tpl
@@ -41,13 +41,17 @@ Create the name of the service account to use
 {{- end -}}
 {{- end -}}
 
+{{/*
+Webhook templates
+*/}}
+
 {{/*
 Expand the name of the chart.
 Manually fix the 'app' and 'name' labels to 'webhook' to maintain
 compatibility with the v0.9 deployment selector.
 */}}
 {{- define "webhook.name" -}}
-{{- printf "webhook" | trunc 63 | trimSuffix "-" -}}
+{{- printf "webhook" -}}
 {{- end -}}
 
 {{/*
@@ -56,16 +60,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "webhook.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- printf "%s-webhook" .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- printf "%s-webhook" .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s-webhook" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 55 | trimSuffix "-" -}}
+{{- printf "%s-webhook" $trimmedName | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
@@ -76,17 +72,21 @@ Create chart name and version as used by the chart label.
 {{- end -}}
 
 {{- define "webhook.selfSignedIssuer" -}}
-{{ printf "%s-selfsign" (include "webhook.fullname" .) }}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 46 | trimSuffix "-" -}}
+{{ printf "%s-webhook-selfsign" $trimmedName }}
 {{- end -}}
 
 {{- define "webhook.rootCAIssuer" -}}
-{{ printf "%s-ca" (include "webhook.fullname" .) }}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 52 | trimSuffix "-" -}}
+{{ printf "%s-webhook-ca" $trimmedName }}
 {{- end -}}
 
 {{- define "webhook.rootCACertificate" -}}
-{{ printf "%s-ca" (include "webhook.fullname" .) }}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 52 | trimSuffix "-" -}}
+{{ printf "%s-webhook-ca" $trimmedName }}
 {{- end -}}
 
 {{- define "webhook.servingCertificate" -}}
-{{ printf "%s-tls" (include "webhook.fullname" .) }}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 51 | trimSuffix "-" -}}
+{{ printf "%s-webhook-tls" $trimmedName }}
 {{- end -}}

From 4586ecf9309c5a73edabecf3caf5ecd206e67ef4 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Fri, 25 Oct 2019 12:22:48 +0100
Subject: [PATCH 2/3] Move cainjector chart into main chart

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 .../cert-manager/cainjector/.helmignore       | 21 -----
 .../charts/cert-manager/cainjector/Chart.yaml | 17 ----
 .../cainjector/templates/NOTES.txt            |  0
 .../cainjector/templates/_helpers.tpl         | 32 --------
 .../cert-manager/cainjector/values.yaml       | 49 ------------
 deploy/charts/cert-manager/requirements.yaml  |  6 --
 .../cert-manager/templates/_helpers.tpl       | 30 +++++++
 .../cainjector-deployment.yaml}               | 30 +++----
 .../cainjector-psp-clusterrole.yaml}          |  0
 .../cainjector-psp-clusterrolebinding.yaml}   |  0
 .../cainjector-psp.yaml}                      |  0
 .../cainjector-rbac.yaml}                     |  8 +-
 .../cainjector-serviceaccount.yaml}           |  2 +-
 deploy/charts/cert-manager/values.yaml        | 79 +++++++++++++------
 14 files changed, 104 insertions(+), 170 deletions(-)
 delete mode 100644 deploy/charts/cert-manager/cainjector/.helmignore
 delete mode 100644 deploy/charts/cert-manager/cainjector/Chart.yaml
 delete mode 100644 deploy/charts/cert-manager/cainjector/templates/NOTES.txt
 delete mode 100644 deploy/charts/cert-manager/cainjector/templates/_helpers.tpl
 delete mode 100644 deploy/charts/cert-manager/cainjector/values.yaml
 delete mode 100644 deploy/charts/cert-manager/requirements.yaml
 rename deploy/charts/cert-manager/{cainjector/templates/deployment.yaml => templates/cainjector-deployment.yaml} (67%)
 rename deploy/charts/cert-manager/{cainjector/templates/psp-clusterrole.yaml => templates/cainjector-psp-clusterrole.yaml} (100%)
 rename deploy/charts/cert-manager/{cainjector/templates/psp-clusterrolebinding.yaml => templates/cainjector-psp-clusterrolebinding.yaml} (100%)
 rename deploy/charts/cert-manager/{cainjector/templates/psp.yaml => templates/cainjector-psp.yaml} (100%)
 rename deploy/charts/cert-manager/{cainjector/templates/rbac.yaml => templates/cainjector-rbac.yaml} (93%)
 rename deploy/charts/cert-manager/{cainjector/templates/serviceaccount.yaml => templates/cainjector-serviceaccount.yaml} (90%)

diff --git a/deploy/charts/cert-manager/cainjector/.helmignore b/deploy/charts/cert-manager/cainjector/.helmignore
deleted file mode 100644
index f0c131944..000000000
--- a/deploy/charts/cert-manager/cainjector/.helmignore
+++ /dev/null
@@ -1,21 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
diff --git a/deploy/charts/cert-manager/cainjector/Chart.yaml b/deploy/charts/cert-manager/cainjector/Chart.yaml
deleted file mode 100644
index a0451ead3..000000000
--- a/deploy/charts/cert-manager/cainjector/Chart.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: cainjector
-apiVersion: v1
-# The version and appVersion fields are set automatically by the release tool
-version: v0.1.0
-appVersion: v0.1.0
-description: A Helm chart for deploying the cert-manager cainjector component
-home: https://github.com/jetstack/cert-manager
-sources:
-  - https://github.com/jetstack/cert-manager
-keywords:
-  - cert-manager
-  - kube-lego
-  - letsencrypt
-  - tls
-maintainers:
-  - name: munnerz
-    email: james@jetstack.io
diff --git a/deploy/charts/cert-manager/cainjector/templates/NOTES.txt b/deploy/charts/cert-manager/cainjector/templates/NOTES.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/deploy/charts/cert-manager/cainjector/templates/_helpers.tpl b/deploy/charts/cert-manager/cainjector/templates/_helpers.tpl
deleted file mode 100644
index f7465cb02..000000000
--- a/deploy/charts/cert-manager/cainjector/templates/_helpers.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "cainjector.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "cainjector.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create chart name and version as used by the chart label.
-*/}}
-{{- define "cainjector.chart" -}}
-{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
diff --git a/deploy/charts/cert-manager/cainjector/values.yaml b/deploy/charts/cert-manager/cainjector/values.yaml
deleted file mode 100644
index ff18395d7..000000000
--- a/deploy/charts/cert-manager/cainjector/values.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-global:
-  ## Reference to one or more secrets to be used when pulling images
-  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
-  ##
-  imagePullSecrets: []
-  # - name: "image-pull-secret"
-
-  # Optional priority class to be used for the cert-manager pods
-  priorityClassName: ""
-  rbac:
-    create: true
-
-  podSecurityPolicy:
-    enabled: false
-
-  leaderElection:
-    # Override the namespace used to store the ConfigMap for leader election
-    namespace: ""
-
-replicaCount: 1
-
-strategy: {}
-  # type: RollingUpdate
-  # rollingUpdate:
-  #   maxSurge: 0
-  #   maxUnavailable: 1
-
-podAnnotations: {}
-
-# Optional additional arguments for cainjector
-extraArgs: []
-
-resources: {}
-  # requests:
-  #   cpu: 10m
-  #   memory: 32Mi
-
-nodeSelector: {}
-
-affinity: {}
-
-tolerations: []
-
-image:
-  repository: quay.io/jetstack/cert-manager-cainjector
-  # Override the image tag to deploy by setting this variable.
-  # If no value is set, the chart's appVersion will be used.
-  # tag: canary
-  pullPolicy: IfNotPresent
diff --git a/deploy/charts/cert-manager/requirements.yaml b/deploy/charts/cert-manager/requirements.yaml
deleted file mode 100644
index b117e6346..000000000
--- a/deploy/charts/cert-manager/requirements.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# requirements.yaml
-dependencies:
-- name: cainjector
-  version: "v0.1.0"
-  repository: "file://cainjector"
-  condition: cainjector.enabled
diff --git a/deploy/charts/cert-manager/templates/_helpers.tpl b/deploy/charts/cert-manager/templates/_helpers.tpl
index 260bdf86c..4522116c0 100644
--- a/deploy/charts/cert-manager/templates/_helpers.tpl
+++ b/deploy/charts/cert-manager/templates/_helpers.tpl
@@ -90,3 +90,33 @@ Create chart name and version as used by the chart label.
 {{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 51 | trimSuffix "-" -}}
 {{ printf "%s-webhook-tls" $trimmedName }}
 {{- end -}}
+
+{{/*
+cainjector templates
+*/}}
+
+{{/*
+Expand the name of the chart.
+Manually fix the 'app' and 'name' labels to 'cainjector' to maintain
+compatibility with the v0.9 deployment selector.
+*/}}
+{{- define "cainjector.name" -}}
+{{- printf "cainjector" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "cainjector.fullname" -}}
+{{- $trimmedName := printf "%s" (include "cert-manager.fullname" .) | trunc 52 | trimSuffix "-" -}}
+{{- printf "%s-cainjector" $trimmedName | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "cainjector.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/deploy/charts/cert-manager/cainjector/templates/deployment.yaml b/deploy/charts/cert-manager/templates/cainjector-deployment.yaml
similarity index 67%
rename from deploy/charts/cert-manager/cainjector/templates/deployment.yaml
rename to deploy/charts/cert-manager/templates/cainjector-deployment.yaml
index 0fd28fd9b..feba9ebae 100644
--- a/deploy/charts/cert-manager/cainjector/templates/deployment.yaml
+++ b/deploy/charts/cert-manager/templates/cainjector-deployment.yaml
@@ -6,18 +6,18 @@ metadata:
   labels:
     app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cainjector.chart" . }}
 spec:
-  replicas: {{ .Values.replicaCount }}
+  replicas: {{ .Values.cainjector.replicaCount }}
   selector:
     matchLabels:
       app: {{ include "cainjector.name" . }}
       app.kubernetes.io/name: {{ include "cainjector.name" . }}
-      app.kubernetes.io/instance:  {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
-  {{- with .Values.strategy }}
+  {{- with .Values.cainjector.strategy }}
   strategy:
     {{- . | toYaml | nindent 4 }}
   {{- end }}
@@ -26,12 +26,12 @@ spec:
       labels:
         app: {{ include "cainjector.name" . }}
         app.kubernetes.io/name: {{ include "cainjector.name" . }}
-        app.kubernetes.io/instance:  {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         helm.sh/chart: {{ include "cainjector.chart" . }}
       annotations:
-      {{- if .Values.podAnnotations }}
-{{ toYaml .Values.podAnnotations | indent 8 }}
+      {{- if .Values.cainjector.podAnnotations }}
+{{ toYaml .Values.cainjector.podAnnotations | indent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "cainjector.fullname" . }}
@@ -40,15 +40,15 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: "{{ .Values.cainjector.image.repository }}:{{ default .Chart.AppVersion .Values.cainjector.image.tag }}"
+          imagePullPolicy: {{ .Values.cainjector.image.pullPolicy }}
           args:
           {{- if .Values.global.logLevel }}
           - --v={{ .Values.global.logLevel }}
           {{- end }}
           - --leader-election-namespace={{ .Values.global.leaderElection.namespace }}
-          {{- if .Values.extraArgs }}
-{{ toYaml .Values.extraArgs | indent 10 }}
+          {{- if .Values.cainjector.extraArgs }}
+{{ toYaml .Values.cainjector.extraArgs | indent 10 }}
           {{- end }}
           env:
           - name: POD_NAMESPACE
@@ -56,16 +56,16 @@ spec:
               fieldRef:
                 fieldPath: metadata.namespace
           resources:
-{{ toYaml .Values.resources | indent 12 }}
-    {{- with .Values.nodeSelector }}
+{{ toYaml .Values.cainjector.resources | indent 12 }}
+    {{- with .Values.cainjector.nodeSelector }}
       nodeSelector:
 {{ toYaml . | indent 8 }}
     {{- end }}
-    {{- with .Values.affinity }}
+    {{- with .Values.cainjector.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}
     {{- end }}
-    {{- with .Values.tolerations }}
+    {{- with .Values.cainjector.tolerations }}
       tolerations:
 {{ toYaml . | indent 8 }}
     {{- end }}
diff --git a/deploy/charts/cert-manager/cainjector/templates/psp-clusterrole.yaml b/deploy/charts/cert-manager/templates/cainjector-psp-clusterrole.yaml
similarity index 100%
rename from deploy/charts/cert-manager/cainjector/templates/psp-clusterrole.yaml
rename to deploy/charts/cert-manager/templates/cainjector-psp-clusterrole.yaml
diff --git a/deploy/charts/cert-manager/cainjector/templates/psp-clusterrolebinding.yaml b/deploy/charts/cert-manager/templates/cainjector-psp-clusterrolebinding.yaml
similarity index 100%
rename from deploy/charts/cert-manager/cainjector/templates/psp-clusterrolebinding.yaml
rename to deploy/charts/cert-manager/templates/cainjector-psp-clusterrolebinding.yaml
diff --git a/deploy/charts/cert-manager/cainjector/templates/psp.yaml b/deploy/charts/cert-manager/templates/cainjector-psp.yaml
similarity index 100%
rename from deploy/charts/cert-manager/cainjector/templates/psp.yaml
rename to deploy/charts/cert-manager/templates/cainjector-psp.yaml
diff --git a/deploy/charts/cert-manager/cainjector/templates/rbac.yaml b/deploy/charts/cert-manager/templates/cainjector-rbac.yaml
similarity index 93%
rename from deploy/charts/cert-manager/cainjector/templates/rbac.yaml
rename to deploy/charts/cert-manager/templates/cainjector-rbac.yaml
index c446d8a86..aa90ccbf8 100644
--- a/deploy/charts/cert-manager/cainjector/templates/rbac.yaml
+++ b/deploy/charts/cert-manager/templates/cainjector-rbac.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ template "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cainjector.chart" . }}
 rules:
@@ -36,7 +36,7 @@ metadata:
   labels:
     app: {{ template "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cainjector.chart" . }}
 roleRef:
@@ -58,7 +58,7 @@ metadata:
   labels:
     app: {{ template "cainjector.name" . }}
     app.kubernetes.io/name: {{ template "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cainjector.chart" . }}
 rules:
@@ -80,7 +80,7 @@ metadata:
   labels:
     app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cainjector.chart" . }}
 roleRef:
diff --git a/deploy/charts/cert-manager/cainjector/templates/serviceaccount.yaml b/deploy/charts/cert-manager/templates/cainjector-serviceaccount.yaml
similarity index 90%
rename from deploy/charts/cert-manager/cainjector/templates/serviceaccount.yaml
rename to deploy/charts/cert-manager/templates/cainjector-serviceaccount.yaml
index 67f186fc9..f085ca771 100644
--- a/deploy/charts/cert-manager/cainjector/templates/serviceaccount.yaml
+++ b/deploy/charts/cert-manager/templates/cainjector-serviceaccount.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ include "cainjector.name" . }}
     app.kubernetes.io/name: {{ include "cainjector.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cainjector.chart" . }}
 {{- if .Values.global.imagePullSecrets }}
diff --git a/deploy/charts/cert-manager/values.yaml b/deploy/charts/cert-manager/values.yaml
index b9075cedb..bd9b7c613 100644
--- a/deploy/charts/cert-manager/values.yaml
+++ b/deploy/charts/cert-manager/values.yaml
@@ -109,6 +109,33 @@ prometheus:
     scrapeTimeout: 30s
     labels: {}
 
+# Use these variables to configure the HTTP_PROXY environment variables
+# http_proxy: "http://proxy:8080"
+# http_proxy: "http://proxy:8080"
+# no_proxy: 127.0.0.1,localhost
+
+# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
+# for example:
+#   affinity:
+#     nodeAffinity:
+#      requiredDuringSchedulingIgnoredDuringExecution:
+#        nodeSelectorTerms:
+#        - matchExpressions:
+#          - key: foo.bar.com/role
+#            operator: In
+#            values:
+#            - master
+affinity: {}
+
+# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
+# for example:
+#   tolerations:
+#   - key: foo.bar.com/role
+#     operator: Equal
+#     value: master
+#     effect: NoSchedule
+tolerations: []
+
 webhook:
   enabled: true
   replicaCount: 1
@@ -150,31 +177,33 @@ webhook:
   injectAPIServerCA: true
 
 cainjector:
-  enabled: true
+  replicaCount: 1
 
-# Use these variables to configure the HTTP_PROXY environment variables
-# http_proxy: "http://proxy:8080"
-# http_proxy: "http://proxy:8080"
-# no_proxy: 127.0.0.1,localhost
+  strategy: {}
+    # type: RollingUpdate
+    # rollingUpdate:
+    #   maxSurge: 0
+    #   maxUnavailable: 1
 
-# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
-# for example:
-#   affinity:
-#     nodeAffinity:
-#      requiredDuringSchedulingIgnoredDuringExecution:
-#        nodeSelectorTerms:
-#        - matchExpressions:
-#          - key: foo.bar.com/role
-#            operator: In
-#            values:
-#            - master
-affinity: {}
+  podAnnotations: {}
 
-# expects input structure as per specification https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#toleration-v1-core
-# for example:
-#   tolerations:
-#   - key: foo.bar.com/role
-#     operator: Equal
-#     value: master
-#     effect: NoSchedule
-tolerations: []
+  # Optional additional arguments for cainjector
+  extraArgs: []
+
+  resources: {}
+    # requests:
+    #   cpu: 10m
+    #   memory: 32Mi
+
+  nodeSelector: {}
+
+  affinity: {}
+
+  tolerations: []
+
+  image:
+    repository: quay.io/jetstack/cert-manager-cainjector
+    # Override the image tag to deploy by setting this variable.
+    # If no value is set, the chart's appVersion will be used.
+    # tag: canary
+    pullPolicy: IfNotPresent

From a6311a8e129e500bbc96174d04ae3989b533bfb9 Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Fri, 25 Oct 2019 12:23:29 +0100
Subject: [PATCH 3/3] Remove leading space on template labels

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 .../cert-manager/templates/deployment.yaml    |  6 ++--
 .../charts/cert-manager/templates/rbac.yaml   | 32 +++++++++----------
 .../cert-manager/templates/service.yaml       |  4 +--
 .../templates/serviceaccount.yaml             |  2 +-
 .../templates/servicemonitor.yaml             |  4 +--
 .../templates/webhook-deployment.yaml         |  6 ++--
 .../templates/webhook-mutating-webhook.yaml   |  2 +-
 .../cert-manager/templates/webhook-rbac.yaml  |  6 ++--
 .../templates/webhook-service.yaml            |  4 +--
 .../templates/webhook-serviceaccount.yaml     |  2 +-
 .../templates/webhook-validating-webhook.yaml |  2 +-
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/deploy/charts/cert-manager/templates/deployment.yaml b/deploy/charts/cert-manager/templates/deployment.yaml
index bcc1a676b..644c1aa3b 100644
--- a/deploy/charts/cert-manager/templates/deployment.yaml
+++ b/deploy/charts/cert-manager/templates/deployment.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 spec:
@@ -15,7 +15,7 @@ spec:
     matchLabels:
       app: {{ template "cert-manager.name" . }}
       app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-      app.kubernetes.io/instance:  {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.strategy }}
   strategy:
@@ -26,7 +26,7 @@ spec:
       labels:
         app: {{ template "cert-manager.name" . }}
         app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-        app.kubernetes.io/instance:  {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         helm.sh/chart: {{ template "cert-manager.chart" . }}
 {{- if .Values.podLabels }}
diff --git a/deploy/charts/cert-manager/templates/rbac.yaml b/deploy/charts/cert-manager/templates/rbac.yaml
index 203be1574..88e194ac7 100644
--- a/deploy/charts/cert-manager/templates/rbac.yaml
+++ b/deploy/charts/cert-manager/templates/rbac.yaml
@@ -8,7 +8,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -30,7 +30,7 @@ metadata:
   labels:
     app: {{ include "cert-manager.name" . }}
     app.kubernetes.io/name: {{ include "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "cert-manager.chart" . }}
 roleRef:
@@ -53,7 +53,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -80,7 +80,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -107,7 +107,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -143,7 +143,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -182,7 +182,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -242,7 +242,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 rules:
@@ -274,7 +274,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -295,7 +295,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -316,7 +316,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -337,7 +337,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -358,7 +358,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -379,7 +379,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 roleRef:
@@ -400,7 +400,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
     rbac.authorization.k8s.io/aggregate-to-view: "true"
@@ -420,7 +420,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
diff --git a/deploy/charts/cert-manager/templates/service.yaml b/deploy/charts/cert-manager/templates/service.yaml
index 734fdef2a..9ebab98e3 100644
--- a/deploy/charts/cert-manager/templates/service.yaml
+++ b/deploy/charts/cert-manager/templates/service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 spec:
@@ -18,5 +18,5 @@ spec:
       targetPort: 9402
   selector:
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
diff --git a/deploy/charts/cert-manager/templates/serviceaccount.yaml b/deploy/charts/cert-manager/templates/serviceaccount.yaml
index c6ddb1f8e..08af1c427 100644
--- a/deploy/charts/cert-manager/templates/serviceaccount.yaml
+++ b/deploy/charts/cert-manager/templates/serviceaccount.yaml
@@ -14,7 +14,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
 {{- end }}
diff --git a/deploy/charts/cert-manager/templates/servicemonitor.yaml b/deploy/charts/cert-manager/templates/servicemonitor.yaml
index ea92a6597..78760eda8 100644
--- a/deploy/charts/cert-manager/templates/servicemonitor.yaml
+++ b/deploy/charts/cert-manager/templates/servicemonitor.yaml
@@ -11,7 +11,7 @@ metadata:
   labels:
     app: {{ template "cert-manager.name" . }}
     app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ template "cert-manager.chart" . }}
     prometheus: {{ .Values.prometheus.servicemonitor.prometheusInstance }}
@@ -23,7 +23,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "cert-manager.name" . }}
-      app.kubernetes.io/instance:  {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/deploy/charts/cert-manager/templates/webhook-deployment.yaml b/deploy/charts/cert-manager/templates/webhook-deployment.yaml
index d5eaed7dd..58516d1d5 100644
--- a/deploy/charts/cert-manager/templates/webhook-deployment.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 spec:
@@ -16,7 +16,7 @@ spec:
     matchLabels:
       app: {{ include "webhook.name" . }}
       app.kubernetes.io/name: {{ include "webhook.name" . }}
-      app.kubernetes.io/instance:  {{ .Release.Name }}
+      app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/managed-by: {{ .Release.Service }}
   {{- with .Values.webhook.strategy }}
   strategy:
@@ -27,7 +27,7 @@ spec:
       labels:
         app: {{ include "webhook.name" . }}
         app.kubernetes.io/name: {{ include "webhook.name" . }}
-        app.kubernetes.io/instance:  {{ .Release.Name }}
+        app.kubernetes.io/instance: {{ .Release.Name }}
         app.kubernetes.io/managed-by: {{ .Release.Service }}
         helm.sh/chart: {{ include "webhook.chart" . }}
       annotations:
diff --git a/deploy/charts/cert-manager/templates/webhook-mutating-webhook.yaml b/deploy/charts/cert-manager/templates/webhook-mutating-webhook.yaml
index 3a85d913d..a428e4561 100644
--- a/deploy/charts/cert-manager/templates/webhook-mutating-webhook.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-mutating-webhook.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
   annotations:
diff --git a/deploy/charts/cert-manager/templates/webhook-rbac.yaml b/deploy/charts/cert-manager/templates/webhook-rbac.yaml
index 86113f7aa..622d16bb0 100644
--- a/deploy/charts/cert-manager/templates/webhook-rbac.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-rbac.yaml
@@ -11,7 +11,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 roleRef:
@@ -37,7 +37,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 roleRef:
@@ -59,7 +59,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 rules:
diff --git a/deploy/charts/cert-manager/templates/webhook-service.yaml b/deploy/charts/cert-manager/templates/webhook-service.yaml
index a1c32b4c7..c4efd067e 100644
--- a/deploy/charts/cert-manager/templates/webhook-service.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-service.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 spec:
@@ -19,6 +19,6 @@ spec:
   selector:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
diff --git a/deploy/charts/cert-manager/templates/webhook-serviceaccount.yaml b/deploy/charts/cert-manager/templates/webhook-serviceaccount.yaml
index 7b41731c4..cd0542f31 100644
--- a/deploy/charts/cert-manager/templates/webhook-serviceaccount.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-serviceaccount.yaml
@@ -7,7 +7,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
 {{- if .Values.global.imagePullSecrets }}
diff --git a/deploy/charts/cert-manager/templates/webhook-validating-webhook.yaml b/deploy/charts/cert-manager/templates/webhook-validating-webhook.yaml
index 9a5e85d85..bf2348f26 100644
--- a/deploy/charts/cert-manager/templates/webhook-validating-webhook.yaml
+++ b/deploy/charts/cert-manager/templates/webhook-validating-webhook.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: {{ include "webhook.name" . }}
     app.kubernetes.io/name: {{ include "webhook.name" . }}
-    app.kubernetes.io/instance:  {{ .Release.Name }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     helm.sh/chart: {{ include "webhook.chart" . }}
   annotations: