diff --git a/stable/influxdb/Chart.yaml b/stable/influxdb/Chart.yaml
index 6d51d6cfab..f3f5609c6e 100755
--- a/stable/influxdb/Chart.yaml
+++ b/stable/influxdb/Chart.yaml
@@ -1,5 +1,5 @@
 name: influxdb
-version: 1.0.0
+version: 1.1.0
 appVersion: 1.7
 description: Scalable datastore for metrics, events, and real-time analytics.
 keywords:
diff --git a/stable/influxdb/templates/deployment.yaml b/stable/influxdb/templates/deployment.yaml
index a4213c40a3..50f62306e7 100644
--- a/stable/influxdb/templates/deployment.yaml
+++ b/stable/influxdb/templates/deployment.yaml
@@ -88,3 +88,11 @@ spec:
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
       {{- end -}}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+      {{- end }}
+      {{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+      {{- end }}
diff --git a/stable/influxdb/values.yaml b/stable/influxdb/values.yaml
index da64a7f0a6..fb7f95f71a 100644
--- a/stable/influxdb/values.yaml
+++ b/stable/influxdb/values.yaml
@@ -105,6 +105,20 @@ ingress:
 ##
 nodeSelector: {}
 
+## Affinity for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+##
+affinity: {}
+
+## Tolerations for pod assignment
+## Ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
+##
+tolerations: []
+# - key: "key"
+#   operator: "Equal|Exists"
+#   value: "value"
+#   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"
+
 ## The InfluxDB image uses several environment variables to automatically
 ## configure certain parts of the server.
 ## Ref: https://hub.docker.com/_/influxdb/