summaryrefslogtreecommitdiff
path: root/edge
diff options
context:
space:
mode:
authorJunYi Wu <wu65830600@163.com>2023-08-20 13:49:26 +0800
committerwujunyi <wu65830600@163.com>2023-08-30 08:22:51 +0800
commit25aa2163b0fc9b58daee869665ec400e972b14d6 (patch)
tree0f9343daabc6bb9ffb222bab1dd9670f9c384219 /edge
parentfeat: add config especial for Windows server (diff)
downloadkubeedge-25aa2163b0fc9b58daee869665ec400e972b14d6.tar.gz
feat: use conditional compilation to complete edgecore windows configuration
Signed-off-by: JunYi Wu <wu65830600@163.com>
Diffstat (limited to 'edge')
-rw-r--r--edge/cmd/edgecore/app/server.go2
-rw-r--r--edge/pkg/devicetwin/dmiserver/const_others.go7
-rw-r--r--edge/pkg/devicetwin/dmiserver/const_windows.go7
-rw-r--r--edge/pkg/devicetwin/dmiserver/server.go20
4 files changed, 23 insertions, 13 deletions
diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go
index 0438829f1..a7fad57fe 100644
--- a/edge/cmd/edgecore/app/server.go
+++ b/edge/cmd/edgecore/app/server.go
@@ -176,7 +176,7 @@ func environmentCheck() error {
for _, process := range processes {
processName, err := process.Name()
if err != nil {
- return err
+ 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..9967832ed 100644
--- a/edge/pkg/devicetwin/dmiserver/server.go
+++ b/edge/pkg/devicetwin/dmiserver/server.go
@@ -46,9 +46,8 @@ import (
)
const (
- SockPath = "/etc/kubeedge/dmi.sock"
- Limit = 1000
- Burst = 100
+ Limit = 1000
+ Burst = 100
)
type server struct {
@@ -181,18 +180,15 @@ func CreateMessageTwinUpdate(name, valueType, value string) ([]byte, error) {
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) {
+ err := os.Remove(sockPath)
+
+ if os.IsNotExist(err) {
return nil
- } else {
+ } else if err != nil {
+ klog.Error(err)
return fmt.Errorf("fail to stat uds socket path")
}
+ return nil
}
func StartDMIServer(cache *DMICache) {