rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-24 22:42:23 +00:00
Code Issues Releases Wiki Activity

Fix sync labels and taints error

Browse Source
This commit is contained in:
galal-hussein 2018-06-26 21:27:25 +02:00 committed by Alena Prokharchyk
parent 50e3ce9cc3
commit d1e0356baf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
k8s/node.go
View File

@ -148,7 +148,6 @@ func SyncLabels(k8sClient *kubernetes.Clientset, nodeName string, toAddLabels, t
func SyncTaints(k8sClient *kubernetes.Clientset, nodeName string, toAddTaints, toDelTaints []string) error { func SyncTaints(k8sClient *kubernetes.Clientset, nodeName string, toAddTaints, toDelTaints []string) error {
updated := false updated := false
var err error var err error
var node *v1.Node
for retries := 0; retries <= 5; retries++ { for retries := 0; retries <= 5; retries++ {
if err = doSyncTaints(k8sClient, nodeName, toAddTaints, toDelTaints); err != nil { if err = doSyncTaints(k8sClient, nodeName, toAddTaints, toDelTaints); err != nil {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
@ -158,7 +157,7 @@ func SyncTaints(k8sClient *kubernetes.Clientset, nodeName string, toAddTaints, t
break break
} }
if !updated { if !updated {
return fmt.Errorf("Timeout waiting for node [%s] to be updated with new set of taints: %v", node.Name, err) return fmt.Errorf("Timeout waiting for node [%s] to be updated with new set of taints: %v", nodeName, err)
} }
return nil return nil
} }