diff --git a/stable/metrics-server/Chart.yaml b/stable/metrics-server/Chart.yaml
index 4654fdcab1..1b9b3f7a4a 100755
--- a/stable/metrics-server/Chart.yaml
+++ b/stable/metrics-server/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: 0.2.1
 description: Metrics Server is a cluster-wide aggregator of resource usage data.
 name: metrics-server
-version: 0.0.3
+version: 1.0.0
 keywords:
 - metrics-server
 home: https://github.com/kubernetes-incubator/metrics-server
diff --git a/stable/metrics-server/README.md b/stable/metrics-server/README.md
index a1a55d9ce2..8620411866 100644
--- a/stable/metrics-server/README.md
+++ b/stable/metrics-server/README.md
@@ -13,3 +13,7 @@ Parameter | Description | Default
 `image.repository` | Image repository | `gcr.io/google_containers/metrics-server-amd64`
 `image.tag` | Image tag | `v0.2.1`
 `image.pullPolicy` | Image pull policy | `IfNotPresent`
+`resources` | CPU/Memory resource requests/limits. | `{}`
+`tolerations` | List of node taints to tolerate (requires Kubernetes >=1.6) | `[]`
+`nodeSelector` | Node labels for pod assignment | `{}`
+`affinity` | Node affinity | `{}`
diff --git a/stable/metrics-server/templates/metrics-server-deployment.yaml b/stable/metrics-server/templates/metrics-server-deployment.yaml
index ca538bb8b9..4a44a0a479 100644
--- a/stable/metrics-server/templates/metrics-server-deployment.yaml
+++ b/stable/metrics-server/templates/metrics-server-deployment.yaml
@@ -26,3 +26,19 @@ spec:
           command:
             - /metrics-server
             - --source=kubernetes.summary_api:''
+        {{- with .Values.resources }}
+          resources:
+{{ toYaml . | indent 12 }}
+        {{- end }}
+    {{- with .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.affinity }}
+      affinity:
+{{ toYaml . | indent 8 }}
+    {{- end }}
+    {{- with .Values.tolerations }}
+      tolerations:
+{{ toYaml . | indent 8 }}
+    {{- end }}
diff --git a/stable/metrics-server/values.yaml b/stable/metrics-server/values.yaml
index 12331221c4..da44dce534 100644
--- a/stable/metrics-server/values.yaml
+++ b/stable/metrics-server/values.yaml
@@ -21,3 +21,11 @@ image:
   repository: gcr.io/google_containers/metrics-server-amd64
   tag: v0.2.1
   pullPolicy: IfNotPresent
+
+resources: {}
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}