Merge pull request #2288 from ottoyiu/cluster-autoscaler-1.6

Change how tolerations are defined in cluster-autoscaler.yaml for k8s 1.6

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