From 5ed70c66e8231e4c23632cb31dee4dfc5d38770a Mon Sep 17 00:00:00 2001 From: Gaurav Singh Date: Sun, 19 Apr 2020 11:16:21 -0400 Subject: [PATCH] [kubelet] nodestatus: remove slice nil check --- pkg/kubelet/nodestatus/setters.go | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkg/kubelet/nodestatus/setters.go b/pkg/kubelet/nodestatus/setters.go index 393f5e2de35..60b8604f17e 100644 --- a/pkg/kubelet/nodestatus/setters.go +++ b/pkg/kubelet/nodestatus/setters.go @@ -317,13 +317,11 @@ func MachineInfo(nodeName string, } devicePluginCapacity, devicePluginAllocatable, removedDevicePlugins = devicePluginResourceCapacityFunc() - if devicePluginCapacity != nil { - for k, v := range devicePluginCapacity { - if old, ok := node.Status.Capacity[k]; !ok || old.Value() != v.Value() { - klog.V(2).Infof("Update capacity for %s to %d", k, v.Value()) - } - node.Status.Capacity[k] = v + for k, v := range devicePluginCapacity { + if old, ok := node.Status.Capacity[k]; !ok || old.Value() != v.Value() { + klog.V(2).Infof("Update capacity for %s to %d", k, v.Value()) } + node.Status.Capacity[k] = v } for _, removedResource := range removedDevicePlugins { @@ -365,13 +363,11 @@ func MachineInfo(nodeName string, node.Status.Allocatable[k] = value } - if devicePluginAllocatable != nil { - for k, v := range devicePluginAllocatable { - if old, ok := node.Status.Allocatable[k]; !ok || old.Value() != v.Value() { - klog.V(2).Infof("Update allocatable for %s to %d", k, v.Value()) - } - node.Status.Allocatable[k] = v + for k, v := range devicePluginAllocatable { + if old, ok := node.Status.Allocatable[k]; !ok || old.Value() != v.Value() { + klog.V(2).Infof("Update allocatable for %s to %d", k, v.Value()) } + node.Status.Allocatable[k] = v } // for every huge page reservation, we need to remove it from allocatable memory for k, v := range node.Status.Capacity {