Merge pull request #4967 from wujunyi792/feat/windows-nodes-edgecore

Feat/windows nodes edgecore

7 files changed, 69 insertions, 21 deletions

diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go
index 0438829f1..e3ad3429e 100644
--- a/edge/cmd/edgecore/app/server.go
+++ b/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
diff --git a/edge/pkg/devicetwin/dmiserver/const_others.go b/edge/pkg/devicetwin/dmiserver/const_others.go
new file mode 100644
index 000000000..f06eb0b58
--- /dev/null
+++ b/edge/pkg/devicetwin/dmiserver/const_others.go
@@ -0,0 +1,7 @@
+//go:build !windows
+
+package dmiserver
+
+const (
+	SockPath = "/etc/kubeedge/dmi.sock"
+)
diff --git a/edge/pkg/devicetwin/dmiserver/const_windows.go b/edge/pkg/devicetwin/dmiserver/const_windows.go
new file mode 100644
index 000000000..9f68fd48f
--- /dev/null
+++ b/edge/pkg/devicetwin/dmiserver/const_windows.go
@@ -0,0 +1,7 @@
+//go:build windows
+
+package dmiserver
+
+const (
+	SockPath = "c:\\etc\\kubeedge\\dmi.sock"
+)
diff --git a/edge/pkg/devicetwin/dmiserver/server.go b/edge/pkg/devicetwin/dmiserver/server.go
index a63d20ae8..83eee807f 100644
--- a/edge/pkg/devicetwin/dmiserver/server.go
+++ b/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 {
diff --git a/edge/pkg/devicetwin/dmiserver/server_others.go b/edge/pkg/devicetwin/dmiserver/server_others.go
new file mode 100644
index 000000000..48f9b3c0a
--- /dev/null
+++ b/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")
+	}
+}
diff --git a/edge/pkg/devicetwin/dmiserver/server_windows.go b/edge/pkg/devicetwin/dmiserver/server_windows.go
new file mode 100644
index 000000000..28a398c9c
--- /dev/null
+++ b/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
+}
diff --git a/edge/pkg/edged/config/config.go b/edge/pkg/edged/config/config.go
index 975b34442..52228dbad 100644
--- a/edge/pkg/edged/config/config.go
+++ b/edge/pkg/edged/config/config.go
@@ -184,6 +184,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