From 773bb434ae55c3f60bea35d92b6faeaf63a6821e Mon Sep 17 00:00:00 2001
From: Michael Goodness <mgoodness@gmail.com>
Date: Thu, 2 Mar 2017 13:21:22 -0600
Subject: [PATCH] [stable/aws-cluster-autoscaler]: nodeSelector (#640)

* Added nodeSelector

* extraArgs is hash

* Remove default resource requests & limits

* Added logo

* Version bump
---
 stable/aws-cluster-autoscaler/Chart.yaml      |  3 ++-
 stable/aws-cluster-autoscaler/README.md       |  5 +++--
 .../templates/deployment.yaml                 |  4 ++++
 stable/aws-cluster-autoscaler/values.yaml     | 22 ++++++++++++-------
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/stable/aws-cluster-autoscaler/Chart.yaml b/stable/aws-cluster-autoscaler/Chart.yaml
index 189325a734..b9102ed35a 100644
--- a/stable/aws-cluster-autoscaler/Chart.yaml
+++ b/stable/aws-cluster-autoscaler/Chart.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 description: Scales worker nodes within autoscaling groups.
+icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png
 name: aws-cluster-autoscaler
-version: 0.2.0
+version: 0.2.1
 sources:
   - https://github.com/kubernetes/contrib/tree/master/cluster-autoscaler/cloudprovider/aws
 maintainers:
diff --git a/stable/aws-cluster-autoscaler/README.md b/stable/aws-cluster-autoscaler/README.md
index 7d786c59ca..10f9b40ecf 100644
--- a/stable/aws-cluster-autoscaler/README.md
+++ b/stable/aws-cluster-autoscaler/README.md
@@ -51,9 +51,10 @@ Parameter | Description | Default
 `image.tag` | Image tag | `v0.4.0`
 `image.pullPolicy` | Image pull policy | `IfNotPresent`
 `extraArgs` | additional container arguments | `{}`
-`podAnnotations` | annotations to add to each pod | {}
+`nodeSelector` | node labels for pod assignment | `{}`
+`podAnnotations` | annotations to add to each pod | `{}`
 `replicaCount` | desired number of pods | `1`
-`resources` | pod resource requests & limits | `limits: {cpu: 100m, memory: 300Mi}, requests: {cpu: 100m, memory: 300Mi}`
+`resources` | pod resource requests & limits | `{}`
 `scaleDownDelay` | time to wait between scaling operations | `10m` (10 minutes)
 `service.annotations` | annotations to add to service | none
 `service.clusterIP` | IP address to assign to service | `""`
diff --git a/stable/aws-cluster-autoscaler/templates/deployment.yaml b/stable/aws-cluster-autoscaler/templates/deployment.yaml
index 0eb74c3f0a..b1fbfdf928 100644
--- a/stable/aws-cluster-autoscaler/templates/deployment.yaml
+++ b/stable/aws-cluster-autoscaler/templates/deployment.yaml
@@ -47,6 +47,10 @@ spec:
             - name: ssl-certs
               mountPath: /etc/ssl/certs/ca-certificates.crt
               readOnly: true
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
       volumes:
         - name: ssl-certs
           hostPath:
diff --git a/stable/aws-cluster-autoscaler/values.yaml b/stable/aws-cluster-autoscaler/values.yaml
index 797477c6c4..c279e74aa6 100644
--- a/stable/aws-cluster-autoscaler/values.yaml
+++ b/stable/aws-cluster-autoscaler/values.yaml
@@ -10,17 +10,23 @@ image:
   tag: v0.4.0
   pullPolicy: IfNotPresent
 
-extraArgs: []
+extraArgs: {}
+
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+
 podAnnotations: {}
 replicaCount: 1
 
-resources:
-  limits:
-    cpu: 100m
-    memory: 300Mi
-  requests:
-    cpu: 100m
-    memory: 300Mi
+resources: {}
+  # limits:
+  #   cpu: 100m
+  #   memory: 300Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 300Mi
 
 scaleDownDelay: 10m