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

Check if labels maps is nil

Browse Source
This commit is contained in:
galal-hussein
2018-03-02 02:40:00 +02:00
parent c3d3d013dc
commit 64e4d2c01d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
k8s/node.go
View File

@@ -139,10 +139,6 @@ func SyncTaints(k8sClient *kubernetes.Clientset, nodeName string, toAddTaints, t
func doSyncLabels(k8sClient *kubernetes.Clientset, nodeName string, toAddLabels, toDelLabels map[string]string) error {
node, err := GetNode(k8sClient, nodeName)
oldLabels := make(map[string]string)
for k, v := range node.Labels {
oldLabels[k] = v
}
if err != nil {
if apierrors.IsNotFound(err) {
logrus.Debugf("[hosts] Can't find node by name [%s]", nodeName)
@@ -150,6 +146,15 @@ func doSyncLabels(k8sClient *kubernetes.Clientset, nodeName string, toAddLabels,
}
return err
}
oldLabels := map[string]string{}
if node.Labels == nil {
node.Labels = map[string]string{}
}
for k, v := range node.Labels {
oldLabels[k] = v
}
// Delete Labels
for key := range toDelLabels {
if _, ok := node.Labels[key]; ok {