Merge pull request #84472 from gab-satchi/windows-build-label

Adds Windows build information as a label on the node
This commit is contained in:
Kubernetes Prow Robot 2019-11-13 21:46:19 -08:00 committed by GitHub
commit 42273a4dbf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 126 additions and 87 deletions

View File

@ -18,6 +18,8 @@ go_library(
"kubelet_network_linux.go", "kubelet_network_linux.go",
"kubelet_network_others.go", "kubelet_network_others.go",
"kubelet_node_status.go", "kubelet_node_status.go",
"kubelet_node_status_others.go",
"kubelet_node_status_windows.go",
"kubelet_pods.go", "kubelet_pods.go",
"kubelet_resources.go", "kubelet_resources.go",
"kubelet_volumes.go", "kubelet_volumes.go",
@ -149,7 +151,12 @@ go_library(
"//vendor/k8s.io/utils/integer:go_default_library", "//vendor/k8s.io/utils/integer:go_default_library",
"//vendor/k8s.io/utils/net:go_default_library", "//vendor/k8s.io/utils/net:go_default_library",
"//vendor/k8s.io/utils/path:go_default_library", "//vendor/k8s.io/utils/path:go_default_library",
], ] + select({
"@io_bazel_rules_go//go/platform:windows": [
"//pkg/kubelet/winstats:go_default_library",
],
"//conditions:default": [],
}),
) )
go_test( go_test(

View File

@ -156,6 +156,7 @@ func (kl *Kubelet) updateDefaultLabels(initialNode, existingNode *v1.Node) bool
v1.LabelInstanceType, v1.LabelInstanceType,
v1.LabelOSStable, v1.LabelOSStable,
v1.LabelArchStable, v1.LabelArchStable,
v1.LabelWindowsBuild,
kubeletapis.LabelOS, kubeletapis.LabelOS,
kubeletapis.LabelArch, kubeletapis.LabelArch,
} }
@ -231,6 +232,14 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
Unschedulable: !kl.registerSchedulable, Unschedulable: !kl.registerSchedulable,
}, },
} }
osLabels, err := getOSSpecificLabels()
if err != nil {
return nil, err
}
for label, value := range osLabels {
node.Labels[label] = value
}
nodeTaints := make([]v1.Taint, 0) nodeTaints := make([]v1.Taint, 0)
if len(kl.registerWithTaints) > 0 { if len(kl.registerWithTaints) > 0 {
taints := make([]v1.Taint, len(kl.registerWithTaints)) taints := make([]v1.Taint, len(kl.registerWithTaints))

View File

@ -0,0 +1,23 @@
// +build !windows
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package kubelet
func getOSSpecificLabels() (map[string]string, error) {
return nil, nil
}

View File

@ -0,0 +1,33 @@
// +build windows
/*
Copyright 2019 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package kubelet
import (
v1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/kubelet/winstats"
)
func getOSSpecificLabels() (map[string]string, error) {
osInfo, err := winstats.GetOSInfo()
if err != nil {
return nil, err
}
return map[string]string{v1.LabelWindowsBuild: osInfo.GetBuild()}, nil
}

View File

@ -20,6 +20,7 @@ go_library(
"//vendor/github.com/google/cadvisor/info/v1:go_default_library", "//vendor/github.com/google/cadvisor/info/v1:go_default_library",
"//vendor/github.com/google/cadvisor/info/v2:go_default_library", "//vendor/github.com/google/cadvisor/info/v2:go_default_library",
"//vendor/golang.org/x/sys/windows:go_default_library", "//vendor/golang.org/x/sys/windows:go_default_library",
"//vendor/golang.org/x/sys/windows/registry:go_default_library",
"//vendor/k8s.io/klog:go_default_library", "//vendor/k8s.io/klog:go_default_library",
], ],
"//conditions:default": [], "//conditions:default": [],

View File

@ -78,19 +78,14 @@ func (p *perfCounterNodeStatsClient) startMonitoring() error {
return err return err
} }
kernelVersion, err := getKernelVersion() osInfo, err := GetOSInfo()
if err != nil {
return err
}
osImageVersion, err := getOSImageVersion()
if err != nil { if err != nil {
return err return err
} }
p.nodeInfo = nodeInfo{ p.nodeInfo = nodeInfo{
kernelVersion: kernelVersion, kernelVersion: osInfo.GetPatchVersion(),
osImageVersion: osImageVersion, osImageVersion: osInfo.ProductName,
memoryPhysicalCapacityBytes: memory, memoryPhysicalCapacityBytes: memory,
startTime: time.Now(), startTime: time.Now(),
} }

View File

@ -20,96 +20,63 @@ package winstats
import ( import (
"fmt" "fmt"
"unsafe" "golang.org/x/sys/windows/registry"
"golang.org/x/sys/windows"
) )
// getCurrentVersionVal gets value of specified key from registry. //OSInfo is a convenience class for retrieving Windows OS information
func getCurrentVersionVal(key string) (string, error) { type OSInfo struct {
var h windows.Handle BuildNumber, ProductName string
if err := windows.RegOpenKeyEx(windows.HKEY_LOCAL_MACHINE, MajorVersion, MinorVersion, UBR uint64
windows.StringToUTF16Ptr(`SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\`),
0,
windows.KEY_READ,
&h); err != nil {
return "", err
}
defer windows.RegCloseKey(h)
var buf [128]uint16
var typ uint32
n := uint32(len(buf) * int(unsafe.Sizeof(buf[0]))) // api expects array of bytes, not uint16
if err := windows.RegQueryValueEx(h,
windows.StringToUTF16Ptr(key),
nil,
&typ,
(*byte)(unsafe.Pointer(&buf[0])),
&n); err != nil {
return "", err
}
return windows.UTF16ToString(buf[:]), nil
} }
// getVersionRevision gets revision from UBR registry. // GetOSInfo reads Windows version information from the registry
func getVersionRevision() (uint16, error) { func GetOSInfo() (*OSInfo, error) {
revisionString, err := getCurrentVersionVal("UBR") k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
if err != nil { if err != nil {
return 0, err return nil, err
}
defer k.Close()
buildNumber, _, err := k.GetStringValue("CurrentBuildNumber")
if err != nil {
return nil, err
} }
revision, err := windows.UTF16FromString(revisionString) majorVersionNumber, _, err := k.GetIntegerValue("CurrentMajorVersionNumber")
if err != nil { if err != nil {
return 0, err return nil, err
} }
return revision[0], nil minorVersionNumber, _, err := k.GetIntegerValue("CurrentMinorVersionNumber")
if err != nil {
return nil, err
}
revision, _, err := k.GetIntegerValue("UBR")
if err != nil {
return nil, err
}
productName, _, err := k.GetStringValue("ProductName")
if err != nil {
return nil, nil
}
return &OSInfo{
BuildNumber: buildNumber,
ProductName: productName,
MajorVersion: majorVersionNumber,
MinorVersion: minorVersionNumber,
UBR: revision,
}, nil
} }
// getKernelVersion gets the version of windows kernel. //GetPatchVersion returns full OS version with patch
func getKernelVersion() (string, error) { func (o *OSInfo) GetPatchVersion() string {
// Get CurrentBuildNumber. return fmt.Sprintf("%d.%d.%s.%d", o.MajorVersion, o.MinorVersion, o.BuildNumber, o.UBR)
buildNumber, err := getCurrentVersionVal("CurrentBuildNumber")
if err != nil {
return "", err
}
// Get CurrentMajorVersionNumber.
majorVersionNumberString, err := getCurrentVersionVal("CurrentMajorVersionNumber")
if err != nil {
return "", err
}
majorVersionNumber, err := windows.UTF16FromString(majorVersionNumberString)
if err != nil {
return "", err
}
// Get CurrentMinorVersionNumber.
minorVersionNumberString, err := getCurrentVersionVal("CurrentMinorVersionNumber")
if err != nil {
return "", err
}
minorVersionNumber, err := windows.UTF16FromString(minorVersionNumberString)
if err != nil {
return "", err
}
// Get UBR.
revision, err := getVersionRevision()
if err != nil {
return "", err
}
return fmt.Sprintf("%d.%d.%s.%d", majorVersionNumber[0], minorVersionNumber[0], buildNumber, revision), nil
} }
// getOSImageVersion gets the osImage name and version. //GetBuild returns OS version upto build number
func getOSImageVersion() (string, error) { func (o *OSInfo) GetBuild() string {
productName, err := getCurrentVersionVal("ProductName") return fmt.Sprintf("%d.%d.%s", o.MajorVersion, o.MinorVersion, o.BuildNumber)
if err != nil {
return "", nil
}
return productName, nil
} }

View File

@ -30,6 +30,10 @@ const (
LabelOSStable = "kubernetes.io/os" LabelOSStable = "kubernetes.io/os"
LabelArchStable = "kubernetes.io/arch" LabelArchStable = "kubernetes.io/arch"
// LabelWindowsBuild is used on Windows nodes to specify the Windows build number starting with v1.17.0.
// It's in the format MajorVersion.MinorVersion.BuildNumber (for ex: 10.0.17763)
LabelWindowsBuild = "node.kubernetes.io/windows-build"
// LabelNamespaceSuffixKubelet is an allowed label namespace suffix kubelets can self-set ([*.]kubelet.kubernetes.io/*) // LabelNamespaceSuffixKubelet is an allowed label namespace suffix kubelets can self-set ([*.]kubelet.kubernetes.io/*)
LabelNamespaceSuffixKubelet = "kubelet.kubernetes.io" LabelNamespaceSuffixKubelet = "kubelet.kubernetes.io"
// LabelNamespaceSuffixNode is an allowed label namespace suffix kubelets can self-set ([*.]node.kubernetes.io/*) // LabelNamespaceSuffixNode is an allowed label namespace suffix kubelets can self-set ([*.]node.kubernetes.io/*)