From 7a4832ab206530d5457d6deae7b0b3ffa904f8a7 Mon Sep 17 00:00:00 2001
From: Alen Komljen <alen.komljen@live.com>
Date: Mon, 25 Jun 2018 20:14:02 +0200
Subject: [PATCH] [stable/k8s-spot-rescheduler] Add support for node selector
 and tolerations (#5789)

* Add support for node selector and tolerations

* Bump minor version for new feature
---
 stable/k8s-spot-rescheduler/Chart.yaml                | 2 +-
 stable/k8s-spot-rescheduler/README.md                 | 2 +-
 stable/k8s-spot-rescheduler/templates/deployment.yaml | 4 ++++
 stable/k8s-spot-rescheduler/values.yaml               | 6 ++++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/stable/k8s-spot-rescheduler/Chart.yaml b/stable/k8s-spot-rescheduler/Chart.yaml
index bb1d57abf0..59e82d754f 100644
--- a/stable/k8s-spot-rescheduler/Chart.yaml
+++ b/stable/k8s-spot-rescheduler/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v0.1.1"
 description: A k8s-spot-rescheduler Helm chart for Kubernetes
 name: k8s-spot-rescheduler
-version: 0.1.2
+version: 0.2.0
 keywords:
   - spot
   - rescheduler
diff --git a/stable/k8s-spot-rescheduler/README.md b/stable/k8s-spot-rescheduler/README.md
index e0cbab86da..b7b405a3fa 100644
--- a/stable/k8s-spot-rescheduler/README.md
+++ b/stable/k8s-spot-rescheduler/README.md
@@ -19,7 +19,7 @@ If your cluster has RBAC enabled, run this command:
 ```
 helm install \
   --namespace kube-system \
-  --set rbac.enabled=true \
+  --set rbac.create=true \
   stable/k8s-spot-rescheduler
 ```
 
diff --git a/stable/k8s-spot-rescheduler/templates/deployment.yaml b/stable/k8s-spot-rescheduler/templates/deployment.yaml
index d435c19361..1b89deb16d 100644
--- a/stable/k8s-spot-rescheduler/templates/deployment.yaml
+++ b/stable/k8s-spot-rescheduler/templates/deployment.yaml
@@ -35,3 +35,7 @@ spec:
             containerPort: 9235
           resources:
 {{ toYaml .Values.resources | indent 12 }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      tolerations:
+{{ toYaml .Values.tolerations | indent 8 }}
diff --git a/stable/k8s-spot-rescheduler/values.yaml b/stable/k8s-spot-rescheduler/values.yaml
index b02802803a..c3c3d23326 100644
--- a/stable/k8s-spot-rescheduler/values.yaml
+++ b/stable/k8s-spot-rescheduler/values.yaml
@@ -32,6 +32,12 @@ resources: {}
   #  cpu: 100m
   #  memory: 128Mi
 
+tolerations: []
+
+# Node labels for pod assignment
+# Ref: https://kubernetes.io/docs/user-guide/node-selection/
+nodeSelector: {}
+
 rbac:
   # Specifies whether RBAC resources should be created
   create: true