From 73037cbd3ae3538cfb987fd83eb315830aa8e779 Mon Sep 17 00:00:00 2001
From: Khris Richardson <khris.richardson@gmail.com>
Date: Mon, 14 May 2018 11:42:59 -0700
Subject: [PATCH 1/2] add pod labels

---
 contrib/charts/cert-manager/Chart.yaml                     | 2 +-
 contrib/charts/cert-manager/README.md                      | 5 +++++
 contrib/charts/cert-manager/templates/_helpers.tpl         | 7 +++++--
 contrib/charts/cert-manager/templates/deployment.yaml      | 3 +++
 contrib/charts/cert-manager/values.yaml                    | 2 ++
 contrib/manifests/cert-manager/rbac/certificate-crd.yaml   | 2 +-
 contrib/manifests/cert-manager/rbac/clusterissuer-crd.yaml | 2 +-
 contrib/manifests/cert-manager/rbac/deployment.yaml        | 2 +-
 contrib/manifests/cert-manager/rbac/issuer-crd.yaml        | 2 +-
 contrib/manifests/cert-manager/rbac/rbac.yaml              | 4 ++--
 contrib/manifests/cert-manager/rbac/serviceaccount.yaml    | 2 +-
 .../cert-manager/without-rbac/certificate-crd.yaml         | 2 +-
 .../cert-manager/without-rbac/clusterissuer-crd.yaml       | 2 +-
 .../manifests/cert-manager/without-rbac/deployment.yaml    | 2 +-
 .../manifests/cert-manager/without-rbac/issuer-crd.yaml    | 2 +-
 15 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/contrib/charts/cert-manager/Chart.yaml b/contrib/charts/cert-manager/Chart.yaml
index 706e9c7a4..fa574cd52 100644
--- a/contrib/charts/cert-manager/Chart.yaml
+++ b/contrib/charts/cert-manager/Chart.yaml
@@ -1,5 +1,5 @@
 name: cert-manager
-version: v0.3.0-alpha.6
+version: v0.3.0-alpha.7
 appVersion: v0.3.0-alpha.2
 description: A Helm chart for cert-manager
 home: https://github.com/jetstack/cert-manager
diff --git a/contrib/charts/cert-manager/README.md b/contrib/charts/cert-manager/README.md
index 5d42f2d1d..991f32a55 100644
--- a/contrib/charts/cert-manager/README.md
+++ b/contrib/charts/cert-manager/README.md
@@ -74,6 +74,7 @@ The following table lists the configurable parameters of the cert-manager chart
 | `ingressShim.defaultACMEChallengeType` | Optional default challenge type to use for ingresses using ACME issuers |  |
 | `ingressShim.defaultACMEDNS01ChallengeProvider` | Optional default DNS01 challenge provider to use for ingresses using ACME issuers with DNS01 |  |
 | `podAnnotations` | Annotations to add to the cert-manager pod | `{}` |
+| `podLabels` | Labels to add to the cert-manager pod | `{}` |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
 
@@ -83,3 +84,7 @@ Alternatively, a YAML file that specifies the values for the above parameters ca
 $ helm install --name my-release -f values.yaml .
 ```
 > **Tip**: You can use the default [values.yaml](values.yaml)
+
+## Contributing
+
+This chart is maintained at [github.com/jetstack/cert-manager](https://github.com/jetstack/cert-manager/tree/master/contrib/charts/cert-manager).
diff --git a/contrib/charts/cert-manager/templates/_helpers.tpl b/contrib/charts/cert-manager/templates/_helpers.tpl
index 5883b323d..a2774242b 100644
--- a/contrib/charts/cert-manager/templates/_helpers.tpl
+++ b/contrib/charts/cert-manager/templates/_helpers.tpl
@@ -12,8 +12,11 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "cert-manager.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- $fullname := printf "%s-%s" $name .Release.Name -}}
-{{- default $fullname .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- if ne $name .Release.Name -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
 {{- end -}}
 
 {{/*
diff --git a/contrib/charts/cert-manager/templates/deployment.yaml b/contrib/charts/cert-manager/templates/deployment.yaml
index 2d25e870b..aa973e211 100644
--- a/contrib/charts/cert-manager/templates/deployment.yaml
+++ b/contrib/charts/cert-manager/templates/deployment.yaml
@@ -19,6 +19,9 @@ spec:
       labels:
         app: {{ template "cert-manager.name" . }}
         release: {{ .Release.Name }}
+{{- if .Values.podLabels }}
+{{ toYaml .Values.podLabels | indent 8 }}
+{{- end }}
       annotations:
       {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | indent 8 }}
diff --git a/contrib/charts/cert-manager/values.yaml b/contrib/charts/cert-manager/values.yaml
index 8b82b6595..5ba136a07 100644
--- a/contrib/charts/cert-manager/values.yaml
+++ b/contrib/charts/cert-manager/values.yaml
@@ -45,6 +45,8 @@ resources: {}
 
 podAnnotations: {}
 
+podLabels: {}
+
 nodeSelector: {}
 
 ingressShim: {}
diff --git a/contrib/manifests/cert-manager/rbac/certificate-crd.yaml b/contrib/manifests/cert-manager/rbac/certificate-crd.yaml
index 70e958b5f..e0842ada0 100644
--- a/contrib/manifests/cert-manager/rbac/certificate-crd.yaml
+++ b/contrib/manifests/cert-manager/rbac/certificate-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/rbac/clusterissuer-crd.yaml b/contrib/manifests/cert-manager/rbac/clusterissuer-crd.yaml
index e0548f7c6..432a7f70c 100644
--- a/contrib/manifests/cert-manager/rbac/clusterissuer-crd.yaml
+++ b/contrib/manifests/cert-manager/rbac/clusterissuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/rbac/deployment.yaml b/contrib/manifests/cert-manager/rbac/deployment.yaml
index 01ae940a4..52002fcd0 100644
--- a/contrib/manifests/cert-manager/rbac/deployment.yaml
+++ b/contrib/manifests/cert-manager/rbac/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/rbac/issuer-crd.yaml b/contrib/manifests/cert-manager/rbac/issuer-crd.yaml
index 2631a3561..672f305b3 100644
--- a/contrib/manifests/cert-manager/rbac/issuer-crd.yaml
+++ b/contrib/manifests/cert-manager/rbac/issuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/rbac/rbac.yaml b/contrib/manifests/cert-manager/rbac/rbac.yaml
index afbe18cfa..6a95cb3d9 100644
--- a/contrib/manifests/cert-manager/rbac/rbac.yaml
+++ b/contrib/manifests/cert-manager/rbac/rbac.yaml
@@ -6,7 +6,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 rules:
@@ -31,7 +31,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 roleRef:
diff --git a/contrib/manifests/cert-manager/rbac/serviceaccount.yaml b/contrib/manifests/cert-manager/rbac/serviceaccount.yaml
index 5771de0dd..8a965d925 100644
--- a/contrib/manifests/cert-manager/rbac/serviceaccount.yaml
+++ b/contrib/manifests/cert-manager/rbac/serviceaccount.yaml
@@ -7,6 +7,6 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
\ No newline at end of file
diff --git a/contrib/manifests/cert-manager/without-rbac/certificate-crd.yaml b/contrib/manifests/cert-manager/without-rbac/certificate-crd.yaml
index 70e958b5f..e0842ada0 100644
--- a/contrib/manifests/cert-manager/without-rbac/certificate-crd.yaml
+++ b/contrib/manifests/cert-manager/without-rbac/certificate-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/without-rbac/clusterissuer-crd.yaml b/contrib/manifests/cert-manager/without-rbac/clusterissuer-crd.yaml
index e0548f7c6..432a7f70c 100644
--- a/contrib/manifests/cert-manager/without-rbac/clusterissuer-crd.yaml
+++ b/contrib/manifests/cert-manager/without-rbac/clusterissuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/without-rbac/deployment.yaml b/contrib/manifests/cert-manager/without-rbac/deployment.yaml
index f35c6fe37..f56c351ec 100644
--- a/contrib/manifests/cert-manager/without-rbac/deployment.yaml
+++ b/contrib/manifests/cert-manager/without-rbac/deployment.yaml
@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:
diff --git a/contrib/manifests/cert-manager/without-rbac/issuer-crd.yaml b/contrib/manifests/cert-manager/without-rbac/issuer-crd.yaml
index 2631a3561..672f305b3 100644
--- a/contrib/manifests/cert-manager/without-rbac/issuer-crd.yaml
+++ b/contrib/manifests/cert-manager/without-rbac/issuer-crd.yaml
@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-v0.3.0-alpha.6
+    chart: cert-manager-v0.3.0-alpha.7
     release: cert-manager
     heritage: Tiller
 spec:

From 7ba58460515dae6f8248e14d9abd3c50ce19d389 Mon Sep 17 00:00:00 2001
From: Khris Richardson <khris.richardson@gmail.com>
Date: Tue, 22 May 2018 16:56:32 -0700
Subject: [PATCH 2/2] revert fullname in lieu of #572

---
 contrib/charts/cert-manager/templates/_helpers.tpl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/contrib/charts/cert-manager/templates/_helpers.tpl b/contrib/charts/cert-manager/templates/_helpers.tpl
index a2774242b..5883b323d 100644
--- a/contrib/charts/cert-manager/templates/_helpers.tpl
+++ b/contrib/charts/cert-manager/templates/_helpers.tpl
@@ -12,11 +12,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 */}}
 {{- define "cert-manager.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if ne $name .Release.Name -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s" $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- $fullname := printf "%s-%s" $name .Release.Name -}}
+{{- default $fullname .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*