Merge pull request #869 from gintautassulskus/affinity-and-tolerations

added affinity and tolerations

contrib/charts/cert-manager/Chart.yaml

@@ -1,5 +1,5 @@
 name: cert-manager
-version: v0.4.0-dev.5
+version: v0.4.0-dev.6
 appVersion: v0.4.0-dev.0
 description: A Helm chart for cert-manager
 home: https://github.com/jetstack/cert-manager

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

@@ -59,6 +59,14 @@ spec:
           {{- if .defaultACMEDNS01ChallengeProvider }}
           - --default-acme-issuer-dns01-provider-name={{ .defaultACMEDNS01ChallengeProvider }}
           {{- end }}
+          {{- end }}
+          {{- if .Values.affinity }}
+          affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+          {{- end }}
+          {{- if .Values.tolerations }}
+          tolerations:
+{{ toYaml .Values.tolerations | indent 10 }}
           {{- end }}
           env:
           - name: POD_NAMESPACE

contrib/charts/cert-manager/values.yaml

@@ -81,3 +81,25 @@ createNamespaceResource: false
 # 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: []

contrib/manifests/cert-manager/with-rbac.yaml

@@ -18,7 +18,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 ---
@@ -31,7 +31,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -55,7 +55,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -75,7 +75,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -93,7 +93,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 rules:
@@ -113,7 +113,7 @@ metadata:
   name: cert-manager
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 roleRef:
@@ -133,7 +133,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:

contrib/manifests/cert-manager/without-rbac.yaml

@@ -19,7 +19,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -43,7 +43,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -63,7 +63,7 @@ metadata:
     "helm.sh/hook": crd-install
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec:
@@ -82,7 +82,7 @@ metadata:
   namespace: "cert-manager"
   labels:
     app: cert-manager
-    chart: cert-manager-v0.4.0-dev.5
+    chart: cert-manager-v0.4.0-dev.6
     release: cert-manager
     heritage: Tiller
 spec: