Merge pull request #350 from kiall/chart-scheduling

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Helm Chart: Add support for affinity and tolerations

Adds support for setting the node affinity and tolerations scheduling options

```release-note
Add support for node affinity and tolerations in Helm chart
```

contrib/charts/cert-manager/Chart.yaml

@@ -1,5 +1,5 @@
 name: cert-manager
-version: 0.2.2
+version: 0.2.3
 appVersion: 0.2.3
 description: A Helm chart for cert-manager
 home: https://github.com/jetstack/cert-manager

contrib/charts/cert-manager/README.md

@@ -65,6 +65,8 @@ The following tables lists the configurable parameters of the cert-manager chart
 | `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the fullname template | ``
 | `resources` | CPU/memory resource requests/limits | `requests: {cpu: 10m, memory: 32Mi}` |
 | `nodeSelector` | Node labels for pod assignment | `{}` |
+| `affinity` | Node affinity for pod assignment | `{}` |
+| `tolerations` | Node tolerations for pod assignment | `[]` |
 | `ingressShim.enabled` | Enable ingress-shim for automatic ingress integration | `true`|
 | `ingressShim.extraArgs` | Optional flags for ingress-shim | `[]` |
 | `ingressShim.resources` | CPU/memory resource requests/limits for ingress-shim | `requests: {cpu: 10m, memory: 32Mi}` |

contrib/charts/cert-manager/templates/deployment.yaml

@@ -44,7 +44,15 @@ spec:
           resources:
 {{ toYaml .Values.ingressShim.resources | indent 12 }}
 {{- end }}
-{{- if .Values.nodeSelector }}
+    {{- with .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}

docs/deploy/rbac/certificate-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/rbac/clusterissuer-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/rbac/deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/rbac/issuer-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/rbac/rbac.yaml

@@ -6,7 +6,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 rules:
@@ -31,7 +31,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 roleRef:

docs/deploy/rbac/serviceaccount.yaml

@@ -7,6 +7,6 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller

docs/deploy/without-rbac/certificate-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: certificates.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/without-rbac/clusterissuer-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: clusterissuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/without-rbac/deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec:

docs/deploy/without-rbac/issuer-crd.yaml

@@ -6,7 +6,7 @@ metadata:
   name: issuers.certmanager.k8s.io
   labels:
     app: cert-manager
-    chart: cert-manager-0.2.2
+    chart: cert-manager-0.2.3
     release: cert-manager
     heritage: Tiller
 spec: