Move to getMachineInfo()

pkg/kubelet/winstats/perfcounter_nodestats.go

@@ -21,7 +21,9 @@ package winstats
 import (
 	"errors"
 	"os"
+	"os/exec"
 	"runtime"
+	"strings"
 	"sync"
 	"time"
 	"unsafe"
@@ -136,10 +138,16 @@ func (p *perfCounterNodeStatsClient) getMachineInfo() (*cadvisorapi.MachineInfo,
 		return nil, err
 	}
 
+	systemUUID, err := getSystemUUID()
+	if err != nil {
+		return nil, err
+	}
+
 	return &cadvisorapi.MachineInfo{
 		NumCores:       runtime.NumCPU(),
 		MemoryCapacity: p.nodeInfo.memoryPhysicalCapacityBytes,
 		MachineID:      hostname,
+		SystemUUID:     systemUUID,
 	}, nil
 }
 
@@ -212,6 +220,16 @@ func (p *perfCounterNodeStatsClient) getCPUUsageNanoCores() uint64 {
 	return cpuUsageNanoCores
 }
 
+func getSystemUUID() (string, error) {
+	cmd := exec.Command("powershell.exe", "-Command", "(Get-CimInstance -Class Win32_ComputerSystemProduct).UUID")
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		return "", err
+	}
+	systemUUID := strings.TrimRight(string(out), "\r\n")
+	return systemUUID, nil
+}
+
 func getPhysicallyInstalledSystemMemoryBytes() (uint64, error) {
 	// We use GlobalMemoryStatusEx instead of GetPhysicallyInstalledSystemMemory
 	// on Windows node for the following reasons:

pkg/kubelet/winstats/winstats.go

@@ -20,8 +20,6 @@ limitations under the License.
 package winstats
 
 import (
-	"os/exec"
-	"strings"
 	"syscall"
 	"time"
 	"unsafe"
@@ -105,24 +103,9 @@ func (c *StatsClient) WinContainerInfos() (map[string]cadvisorapiv2.ContainerInf
 }
 
 // WinMachineInfo returns a cadvisorapi.MachineInfo with details about the
-// node machine. Run the powershell command to get the SystemUUID for Windows node
+// node machine.
-// in here if it isn't provided by cadvisor.
 func (c *StatsClient) WinMachineInfo() (*cadvisorapi.MachineInfo, error) {
-	infos, err := c.client.getMachineInfo()
+	return c.client.getMachineInfo()
-	if err != nil {
-		return nil, err
-	}
-
-	if infos.SystemUUID == "" {
-		cmd := exec.Command("powershell.exe", "-Command", "(Get-CimInstance -Class Win32_ComputerSystemProduct).UUID")
-		out, err := cmd.CombinedOutput()
-		if err != nil {
-			return infos, err
-		}
-		infos.SystemUUID = strings.TrimRight(string(out), "\r\n")
-	}
-
-	return infos, nil
 }
 
 // WinVersionInfo returns a  cadvisorapi.VersionInfo with version info of

pkg/kubelet/winstats/winstats_test.go

@@ -121,7 +121,7 @@ func TestWinMachineInfo(t *testing.T) {
 		NumCores:       4,
 		MemoryCapacity: 1.6e+10,
 		MachineID:      "somehostname",
-		SystemUUID:     machineInfo.SystemUUID,})
+		SystemUUID:     machineInfo.SystemUUID})
 }
 
 func TestWinVersionInfo(t *testing.T) {