diff --git a/stable/stackdriver-exporter/Chart.yaml b/stable/stackdriver-exporter/Chart.yaml
index 1d1f9f7f45..dd80398d1e 100644
--- a/stable/stackdriver-exporter/Chart.yaml
+++ b/stable/stackdriver-exporter/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Stackdriver exporter for Prometheus
 name: stackdriver-exporter
-version: 0.0.6
+version: 1.0.0
 appVersion: 0.6.0
 home: https://www.stackdriver.com/
 sources:
diff --git a/stable/stackdriver-exporter/README.md b/stable/stackdriver-exporter/README.md
index 4ef19c62ef..cb648f21bd 100644
--- a/stable/stackdriver-exporter/README.md
+++ b/stable/stackdriver-exporter/README.md
@@ -78,6 +78,11 @@ Parameter                           | Description
 `web.listenAddress`                 | Port to listen on                                                               | `9255`
 `web.path`                          | Path under which to expose metrics                                              | `/metrics`
 `annotations`                       | Deployment annotations                                                          | `{}`
+`affinity`                          | Pod affinity                                                                    | `{}`
+`nodeSelector`                      | Node labels for pod assignment												  | `{}`
+`tolerations`                       | Node taints to tolerate (requires Kubernetes >=1.6) 							  | `[]`
+
+
 
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`. For example,
diff --git a/stable/stackdriver-exporter/templates/deployment.yaml b/stable/stackdriver-exporter/templates/deployment.yaml
index fdf89342b0..a91b6d7c00 100644
--- a/stable/stackdriver-exporter/templates/deployment.yaml
+++ b/stable/stackdriver-exporter/templates/deployment.yaml
@@ -28,6 +28,10 @@ spec:
 {{ toYaml .Values.annotations | indent 8 }}
 {{- end }}
     spec:
+{{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+{{- end }}
       restartPolicy: {{ .Values.restartPolicy }}
       containers:
         - name: {{ .Chart.Name }}
@@ -74,3 +78,12 @@ spec:
               port: http
             initialDelaySeconds: 10
             timeoutSeconds: 10
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
+{{- if .Values.tolerations }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
+    {{- end }}
+
diff --git a/stable/stackdriver-exporter/values.yaml b/stable/stackdriver-exporter/values.yaml
index 931b02aada..06612e834c 100644
--- a/stable/stackdriver-exporter/values.yaml
+++ b/stable/stackdriver-exporter/values.yaml
@@ -49,4 +49,22 @@ web:
   # Path under which to expose metrics.
   path: /metrics
 
+## Pod affinity
+##
+affinity: {}
+
 annotations: {}
+
+## Node labels for stackdriver-exporter pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
+## Node tolerations for stackdriver-exporter scheduling to nodes with taints
+## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
+##
+tolerations: []
+  # - key: "key"
+  #   operator: "Equal|Exists"
+  #   value: "value"
+  #   effect: "NoSchedule|PreferNoSchedule|NoExecute(1.6 only)"