kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Change how tolerations are defined in cluster-autoscaler.yaml for k8s 1.6
This commit is contained in:
Justin Santa Barbara 2017-04-10 10:59:37 -04:00 committed by GitHub
parent a34cd51bb6 0993e0334b
commit 214f841cb8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/cluster-autoscaler/v1.4.0.yaml
View File

@ -15,6 +15,7 @@ spec:
labels: labels:
k8s-app: cluster-autoscaler k8s-app: cluster-autoscaler
annotations: 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"}]' scheduler.alpha.kubernetes.io/tolerations: '[{"key":"dedicated", "value":"master"}]'
spec: spec:
containers: containers:
@ -43,4 +44,7 @@ spec:
hostPath: hostPath:
path: {{SSL_CERT_PATH}} path: {{SSL_CERT_PATH}}
nodeSelector: nodeSelector:
kubernetes.io/role: master node-role.kubernetes.io/master: ""
tolerations:
- key: "node-role.kubernetes.io/master"
effect: NoSchedule