Feat/windows nodes edgecore

common/constants/default.go

@@ -28,38 +28,17 @@ const (
 
 // Resources
 const (
-	// Certificates
-	DefaultConfigDir            = "/etc/kubeedge/config/"
-	DefaultCAFile               = "/etc/kubeedge/ca/rootCA.crt"
-	DefaultCAKeyFile            = "/etc/kubeedge/ca/rootCA.key"
-	DefaultCertFile             = "/etc/kubeedge/certs/server.crt"
-	DefaultKeyFile              = "/etc/kubeedge/certs/server.key"
+	DefaultCAURL                = "/ca.crt"
+	DefaultCertURL              = "/edge.crt"
+	DefaultNodeUpgradeURL       = "/nodeupgrade"
 	DefaultServiceAccountIssuer = "https://kubernetes.default.svc.cluster.local"
 
-	DefaultCAURL          = "/ca.crt"
-	DefaultCertURL        = "/edge.crt"
-	DefaultNodeUpgradeURL = "/nodeupgrade"
-
-	DefaultStreamCAFile   = "/etc/kubeedge/ca/streamCA.crt"
-	DefaultStreamCertFile = "/etc/kubeedge/certs/stream.crt"
-	DefaultStreamKeyFile  = "/etc/kubeedge/certs/stream.key"
-
-	DefaultMqttCAFile   = "/etc/kubeedge/ca/rootCA.crt"
-	DefaultMqttCertFile = "/etc/kubeedge/certs/server.crt"
-	DefaultMqttKeyFile  = "/etc/kubeedge/certs/server.key"
-
-	// Bootstrap file, contains token used by edgecore to apply for ca/cert
-	BootstrapFile = "/etc/kubeedge/bootstrap-edgecore.conf"
-
 	// Edged
-	DefaultRootDir               = "/var/lib/edged"
-	DefaultDockerAddress         = "unix:///var/run/docker.sock"
-	DefaultRuntimeType           = "remote"
-	DefaultDockershimRootDir     = "/var/lib/dockershim"
-	DefaultEdgedMemoryCapacity   = 7852396000
-	DefaultRemoteRuntimeEndpoint = "unix:///run/containerd/containerd.sock"
-	DefaultRemoteImageEndpoint   = "unix:///run/containerd/containerd.sock"
-	DefaultMosquittoImage        = "eclipse-mosquitto:1.6.15"
+	DefaultDockerAddress       = "unix:///var/run/docker.sock"
+	DefaultDockershimRootDir   = "/var/lib/dockershim"
+	DefaultRuntimeType         = "remote"
+	DefaultEdgedMemoryCapacity = 7852396000
+	DefaultMosquittoImage      = "eclipse-mosquitto:1.6.15"
 	// update PodSandboxImage version when bumping k8s vendor version, consistent with vendor/k8s.io/kubernetes/cmd/kubelet/app/options/container_runtime.go defaultPodSandboxImageVersion
 	// When this value are updated, also update comments in pkg/apis/componentconfig/edgecore/v1alpha1/types.go
 	DefaultPodSandboxImage             = "kubeedge/pause:3.6"
@@ -69,9 +48,6 @@ const (
 	DefaultMaximumDeadContainersPerPod = 1
 	DefaultHostnameOverride            = "default-edge-node"
 	DefaultRegisterNodeNamespace       = "default"
-	DefaultCNIConfDir                  = "/etc/cni/net.d"
-	DefaultCNIBinDir                   = "/opt/cni/bin"
-	DefaultCNICacheDir                 = "/var/lib/cni/cache"
 	DefaultNetworkPluginMTU            = 1500
 	DefaultConcurrentConsumers         = 5
 	DefaultCgroupRoot                  = ""

common/constants/default_others.go

@@ -0,0 +1,33 @@
+//go:build !windows
+
+package constants
+
+// Resources
+const (
+	// Certificates
+	DefaultConfigDir = "/etc/kubeedge/config/"
+	DefaultCAFile    = "/etc/kubeedge/ca/rootCA.crt"
+	DefaultCAKeyFile = "/etc/kubeedge/ca/rootCA.key"
+	DefaultCertFile  = "/etc/kubeedge/certs/server.crt"
+	DefaultKeyFile   = "/etc/kubeedge/certs/server.key"
+
+	DefaultStreamCAFile   = "/etc/kubeedge/ca/streamCA.crt"
+	DefaultStreamCertFile = "/etc/kubeedge/certs/stream.crt"
+	DefaultStreamKeyFile  = "/etc/kubeedge/certs/stream.key"
+
+	DefaultMqttCAFile   = "/etc/kubeedge/ca/rootCA.crt"
+	DefaultMqttCertFile = "/etc/kubeedge/certs/server.crt"
+	DefaultMqttKeyFile  = "/etc/kubeedge/certs/server.key"
+
+	// Bootstrap file, contains token used by edgecore to apply for ca/cert
+	BootstrapFile = "/etc/kubeedge/bootstrap-edgecore.conf"
+
+	// Edged
+	DefaultRootDir               = "/var/lib/edged"
+	DefaultRemoteRuntimeEndpoint = "unix:///run/containerd/containerd.sock"
+	DefaultRemoteImageEndpoint   = "unix:///run/containerd/containerd.sock"
+	DefaultCNIConfDir            = "/etc/cni/net.d"
+	DefaultCNIBinDir             = "/opt/cni/bin"
+	DefaultCNICacheDir           = "/var/lib/cni/cache"
+	DefaultVolumePluginDir       = "/usr/libexec/kubernetes/kubelet-plugins/volume/exec/"
+)

common/constants/default_windows.go

@@ -0,0 +1,36 @@
+//go:build windows
+
+package constants
+
+// Module name and group name
+const ()
+
+// Resources
+const (
+	// Certificates
+	DefaultConfigDir = "c:\\etc\\kubeedge\\config\\"
+	DefaultCAFile    = "c:\\etc\\kubeedge\\ca\\rootCA.crt"
+	DefaultCAKeyFile = "c:\\etc\\kubeedge\\ca\\rootCA.key"
+	DefaultCertFile  = "c:\\etc\\kubeedge\\certs\\server.crt"
+	DefaultKeyFile   = "c:\\etc\\kubeedge\\certs\\server.key"
+
+	DefaultStreamCAFile   = "c:\\etc\\kubeedge\\ca\\streamCA.crt"
+	DefaultStreamCertFile = "c:\\etc\\kubeedge\\certs\\stream.crt"
+	DefaultStreamKeyFile  = "c:\\etc\\kubeedge\\certs\\stream.key"
+
+	DefaultMqttCAFile   = "c:\\etc\\kubeedge\\ca\\rootCA.crt"
+	DefaultMqttCertFile = "c:\\etc\\kubeedge\\certs\\server.crt"
+	DefaultMqttKeyFile  = "c:\\etc\\kubeedge\\certs\\server.key"
+
+	// Bootstrap file, contains token used by edgecore to apply for ca/cert
+	BootstrapFile = "c:\\etc\\kubeedge\\bootstrap-edgecore.conf"
+
+	// Edged
+	DefaultRootDir               = "c:\\var\\lib\\edged"
+	DefaultRemoteRuntimeEndpoint = "npipe://./pipe/containerd-containerd"
+	DefaultRemoteImageEndpoint   = "npipe://./pipe/containerd-containerd"
+	DefaultCNIConfDir            = "c:\\etc\\cni\\net.d"
+	DefaultCNIBinDir             = "c:\\opt\\cni\\bin"
+	DefaultCNICacheDir           = "c:\\var\\lib\\cni\\cache"
+	DefaultVolumePluginDir       = "C:\\usr\\libexec\\kubernetes\\kubelet-plugins\\volume\\exec\\"
+)

edge/cmd/edgecore/app/server.go

@@ -176,7 +176,8 @@ func environmentCheck() error {
 	for _, process := range processes {
 		processName, err := process.Name()
 		if err != nil {
-			return err
+			// err usually cant be fixed by user, so just skip it instead of return error (we only check named process)
+			continue
 		}
 		switch processName {
 		case "kubelet": // if kubelet is running, return error

edge/pkg/devicetwin/dmiserver/const_others.go

@@ -0,0 +1,7 @@
+//go:build !windows
+
+package dmiserver
+
+const (
+	SockPath = "/etc/kubeedge/dmi.sock"
+)

edge/pkg/devicetwin/dmiserver/const_windows.go

@@ -0,0 +1,7 @@
+//go:build windows
+
+package dmiserver
+
+const (
+	SockPath = "c:\\etc\\kubeedge\\dmi.sock"
+)

edge/pkg/devicetwin/dmiserver/server.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net"
-	"os"
 	"sync"
 	"time"
 
@@ -46,9 +45,8 @@ import (
 )
 
 const (
-	SockPath = "/etc/kubeedge/dmi.sock"
-	Limit    = 1000
-	Burst    = 100
+	Limit = 1000
+	Burst = 100
 )
 
 type server struct {
@@ -179,22 +177,6 @@ func CreateMessageTwinUpdate(name, valueType, value string) ([]byte, error) {
 	return msg, err
 }
 
-func initSock(sockPath string) error {
-	klog.Infof("init uds socket: %s", sockPath)
-	_, err := os.Stat(sockPath)
-	if err == nil {
-		err = os.Remove(sockPath)
-		if err != nil {
-			return err
-		}
-		return nil
-	} else if os.IsNotExist(err) {
-		return nil
-	} else {
-		return fmt.Errorf("fail to stat uds socket path")
-	}
-}
-
 func StartDMIServer(cache *DMICache) {
 	err := initSock(SockPath)
 	if err != nil {

edge/pkg/devicetwin/dmiserver/server_others.go

@@ -0,0 +1,26 @@
+//go:build !windows
+
+package dmiserver
+
+import (
+	"fmt"
+	"os"
+
+	"k8s.io/klog/v2"
+)
+
+func initSock(sockPath string) error {
+	klog.Infof("init uds socket: %s", sockPath)
+	_, err := os.Stat(sockPath)
+	if err == nil {
+		err = os.Remove(sockPath)
+		if err != nil {
+			return err
+		}
+		return nil
+	} else if os.IsNotExist(err) {
+		return nil
+	} else {
+		return fmt.Errorf("fail to stat uds socket path")
+	}
+}

edge/pkg/devicetwin/dmiserver/server_windows.go

@@ -0,0 +1,22 @@
+//go:build windows
+
+package dmiserver
+
+import (
+	"fmt"
+	"os"
+
+	"k8s.io/klog/v2"
+)
+
+func initSock(sockPath string) error {
+	klog.Infof("init uds socket: %s", sockPath)
+	err := os.Remove(sockPath)
+	if os.IsNotExist(err) {
+		return nil
+	} else if err != nil {
+		klog.Error(err)
+		return fmt.Errorf("fail to stat uds socket path")
+	}
+	return nil
+}

edge/pkg/edged/config/config.go

@@ -187,6 +187,9 @@ func ConvertConfigEdgedFlagToConfigKubeletFlag(in *v1alpha2.TailoredKubeletFlag,
 	out.RegisterSchedulable = in.RegisterSchedulable
 	out.KeepTerminatedPodVolumes = in.KeepTerminatedPodVolumes
 	out.SeccompDefault = in.SeccompDefault
+	out.WindowsPriorityClass = in.WindowsPriorityClass
+	// out.WindowsService may always be false, or kubelet will try to install itself as a windows service.
+	// out.WindowsService = in.WindowsService
 
 	// container-runtime-specific options
 	out.ContainerRuntime = in.ContainerRuntime

pkg/apis/componentconfig/edgecore/v1alpha2/default.go

@@ -30,14 +30,14 @@ import (
 )
 
 // NewDefaultEdgeCoreConfig returns a full EdgeCoreConfig object
-func NewDefaultEdgeCoreConfig() *EdgeCoreConfig {
+func NewDefaultEdgeCoreConfig() (config *EdgeCoreConfig) {
 	hostnameOverride := util.GetHostname()
 	localIP, _ := util.GetLocalIP(hostnameOverride)
 
 	defaultTailedKubeletConfig := TailoredKubeletConfiguration{}
 	SetDefaultsKubeletConfiguration(&defaultTailedKubeletConfig)
 
-	return &EdgeCoreConfig{
+	config = &EdgeCoreConfig{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       Kind,
 			APIVersion: path.Join(GroupName, APIVersion),
@@ -67,6 +67,7 @@ func NewDefaultEdgeCoreConfig() *EdgeCoreConfig {
 					NodeLabels:              make(map[string]string),
 					RegisterNode:            true,
 					RegisterSchedulable:     true,
+					WindowsPriorityClass:    DefaultWindowsPriorityClass,
 				},
 				CustomInterfaceName:   "",
 				RegisterNodeNamespace: constants.DefaultRegisterNodeNamespace,
@@ -158,17 +159,18 @@ func NewDefaultEdgeCoreConfig() *EdgeCoreConfig {
 			},
 		},
 	}
+	return
 }
 
 // NewMinEdgeCoreConfig returns a common EdgeCoreConfig object
-func NewMinEdgeCoreConfig() *EdgeCoreConfig {
+func NewMinEdgeCoreConfig() (config *EdgeCoreConfig) {
 	hostnameOverride := util.GetHostname()
 	localIP, _ := util.GetLocalIP(hostnameOverride)
 
 	defaultTailedKubeletConfig := TailoredKubeletConfiguration{}
 	SetDefaultsKubeletConfiguration(&defaultTailedKubeletConfig)
 
-	return &EdgeCoreConfig{
+	config = &EdgeCoreConfig{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       Kind,
 			APIVersion: path.Join(GroupName, APIVersion),
@@ -196,6 +198,7 @@ func NewMinEdgeCoreConfig() *EdgeCoreConfig {
 					NodeLabels:              make(map[string]string),
 					RegisterNode:            true,
 					RegisterSchedulable:     true,
+					WindowsPriorityClass:    DefaultWindowsPriorityClass,
 				},
 				CustomInterfaceName:   "",
 				RegisterNodeNamespace: constants.DefaultRegisterNodeNamespace,
@@ -231,4 +234,5 @@ func NewMinEdgeCoreConfig() *EdgeCoreConfig {
 			},
 		},
 	}
+	return
 }

pkg/apis/componentconfig/edgecore/v1alpha2/default_kubelet_configuration.go

@@ -1,5 +1,5 @@
 /*
-Copyright 2022 The KubeEdge Authors.
+Copyright 2023 The KubeEdge Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,18 +31,11 @@ import (
 	kubeletconfigv1beta1 "k8s.io/kubelet/config/v1beta1"
 	configv1beta1 "k8s.io/kubernetes/pkg/kubelet/apis/config/v1beta1"
 	"k8s.io/kubernetes/pkg/kubelet/qos"
-	kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
 	utilpointer "k8s.io/utils/pointer"
 
 	"github.com/kubeedge/kubeedge/common/constants"
 )
 
-var (
-	// TODO: Move these constants to k8s.io/kubelet/config/v1beta1 instead?
-	// Refer to [Node Allocatable](https://git.k8s.io/community/contributors/design-proposals/node/node-allocatable.md) doc for more information.
-	DefaultNodeAllocatableEnforcement = []string{"pods"}
-)
-
 // SetDefaultsKubeletConfiguration sets defaults for tailored kubelet configuration
 func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
 	obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute}
@@ -62,8 +55,6 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
 	obj.ImageGCHighThresholdPercent = utilpointer.Int32Ptr(constants.DefaultImageGCHighThreshold)
 	obj.ImageGCLowThresholdPercent = utilpointer.Int32Ptr(constants.DefaultImageGCLowThreshold)
 	obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute}
-	obj.CgroupsPerQOS = utilpointer.BoolPtr(true)
-	obj.CgroupDriver = "cgroupfs"
 	obj.CPUManagerPolicy = "none"
 	// Keep the same as default NodeStatusUpdateFrequency
 	obj.CPUManagerReconcilePeriod = metav1.Duration{Duration: 10 * time.Second}
@@ -75,8 +66,6 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
 	obj.MaxPods = 110
 	// default nil or negative value to -1 (implies node allocatable pid limit)
 	obj.PodPidsLimit = utilpointer.Int64(-1)
-	obj.ResolverConfig = utilpointer.String(kubetypes.ResolvConfDefault)
-	obj.CPUCFSQuota = utilpointer.BoolPtr(true)
 	obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond}
 	obj.NodeStatusMaxImages = utilpointer.Int32Ptr(0)
 	obj.MaxOpenFiles = 1000000
@@ -93,7 +82,7 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
 	obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5)
 	obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.GetChangeDetectionStrategy
 	obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement
-	obj.VolumePluginDir = configv1beta1.DefaultVolumePluginDir
+	obj.VolumePluginDir = constants.DefaultVolumePluginDir
 	// Use the Default LoggingConfiguration option
 	componentbaseconfigv1alpha1.RecommendedLoggingConfiguration(&obj.Logging)
 	obj.EnableSystemLogHandler = utilpointer.BoolPtr(true)
@@ -102,4 +91,10 @@ func SetDefaultsKubeletConfiguration(obj *TailoredKubeletConfiguration) {
 	obj.SeccompDefault = utilpointer.BoolPtr(false)
 	obj.MemoryThrottlingFactor = utilpointer.Float64Ptr(configv1beta1.DefaultMemoryThrottlingFactor)
 	obj.RegisterNode = utilpointer.BoolPtr(true)
+
+	obj.EnforceNodeAllocatable = DefaultNodeAllocatableEnforcement
+	obj.CgroupDriver = DefaultCgroupDriver
+	obj.CgroupsPerQOS = utilpointer.Bool(DefaultCgroupsPerQOS)
+	obj.ResolverConfig = utilpointer.String(DefaultResolverConfig)
+	obj.CPUCFSQuota = utilpointer.Bool(DefaultCPUCFSQuota)
 }