github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-11 14:11:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101962 from llhhbc/add-osinfo-logs

Browse Source 
Add getOSInfo err info
This commit is contained in:
Kubernetes Prow Robot
2021-08-17 10:29:13 -07:00
committed by GitHub
parent 410702647e 4af506c989
commit db42b67f3c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/kubelet/winstats/version.go
View File

@@ -31,35 +31,38 @@ type OSInfo struct {
// GetOSInfo reads Windows version information from the registry
func GetOSInfo() (*OSInfo, error) {
// for log detail
var keyPrefix string = `regedit:LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion`
k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
if err != nil {
return nil, err
return nil, fmt.Errorf("getOSInfo, open Windows %s failed: %w", keyPrefix, err)
}
defer k.Close()
buildNumber, _, err := k.GetStringValue("CurrentBuildNumber")
if err != nil {
return nil, err
return nil, fmt.Errorf("getOSInfo, get %s\\CurrentBuildNumber failed: %w", keyPrefix, err)
}
majorVersionNumber, _, err := k.GetIntegerValue("CurrentMajorVersionNumber")
if err != nil {
return nil, err
return nil, fmt.Errorf("getOSInfo, get %s\\CurrentMajorVersionNumber failed: %w", keyPrefix, err)
}
minorVersionNumber, _, err := k.GetIntegerValue("CurrentMinorVersionNumber")
if err != nil {
return nil, err
return nil, fmt.Errorf("getOSInfo, get %s\\CurrentMinorVersionNumber failed: %w", keyPrefix, err)
}
revision, _, err := k.GetIntegerValue("UBR")
if err != nil {
return nil, err
return nil, fmt.Errorf("getOSInfo, get %s\\UBR failed: %w", keyPrefix, err)
}
productName, _, err := k.GetStringValue("ProductName")
if err != nil {
return nil, nil
return nil, fmt.Errorf("getOSInfo, get %s\\ProductName failed: %w", keyPrefix, err)
}
return &OSInfo{