From 0993e0334bc90f16c2cb4965aed8300b54baaa61 Mon Sep 17 00:00:00 2001
From: Otto Yiu <otto@live.ca>
Date: Wed, 5 Apr 2017 07:40:39 -0700
Subject: [PATCH] Set tolerations on cluster-autoscaler.yaml as field for
 Kubernetes 1.6 support

---
 addons/cluster-autoscaler/v1.4.0.yaml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/cluster-autoscaler/v1.4.0.yaml b/addons/cluster-autoscaler/v1.4.0.yaml
index 264308acbc..e1356ebd51 100644
--- a/addons/cluster-autoscaler/v1.4.0.yaml
+++ b/addons/cluster-autoscaler/v1.4.0.yaml
@@ -15,6 +15,7 @@ spec:
       labels:
         k8s-app: cluster-autoscaler
       annotations:
+         # For 1.6, we keep the old tolerations in case of a downgrade to 1.5
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated", "value":"master"}]'
     spec:
         containers:
@@ -43,4 +44,7 @@ spec:
             hostPath:
               path: {{SSL_CERT_PATH}}
         nodeSelector:
-          kubernetes.io/role: master
+          node-role.kubernetes.io/master: ""
+        tolerations:
+          - key: "node-role.kubernetes.io/master"
+            effect: NoSchedule