Merge pull request #563 from khrisrichardson/pod-labels

add pod labels
2018-05-24 12:07:41 +01:00 · 2018-05-24 12:07:41 +01:00 · a7b382b974
commit a7b382b974
parent 0bf3ff6835 7ba5846051
14 changed files with 22 additions and 12 deletions
--- 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
--- 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).
--- 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 }}
--- a/contrib/charts/cert-manager/values.yaml
+++ b/contrib/charts/cert-manager/values.yaml
@ -45,6 +45,8 @@ resources: {}

 podAnnotations: {}

+podLabels: {}
+
 nodeSelector: {}

 ingressShim: {}
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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:
--- 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:
--- 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: