diff options
| author | KubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com> | 2024-01-03 16:00:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-03 16:00:15 +0800 |
| commit | cee97bc3be937ceff26b899b1efec0d81dc68c39 (patch) | |
| tree | 49c8c9498ec3408d76748fce892bc28ce1f6c002 /edge | |
| parent | Merge pull request #5326 from wbc6080/upgrade-mapper (diff) | |
| parent | support configuring dmisock path in edgecore (diff) | |
| download | kubeedge-cee97bc3be937ceff26b899b1efec0d81dc68c39.tar.gz | |
Merge pull request #5325 from wbc6080/fix-localup-script
Allow configuration of dmi.sock path
Diffstat (limited to 'edge')
| -rw-r--r-- | edge/pkg/devicetwin/dmiserver/server.go | 11 | ||||
| -rw-r--r-- | edge/test/integration/utils/test_setup.go | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/edge/pkg/devicetwin/dmiserver/server.go b/edge/pkg/devicetwin/dmiserver/server.go index d4818f999..eed5bee91 100644 --- a/edge/pkg/devicetwin/dmiserver/server.go +++ b/edge/pkg/devicetwin/dmiserver/server.go @@ -37,6 +37,7 @@ import ( "github.com/kubeedge/kubeedge/common/constants" messagepkg "github.com/kubeedge/kubeedge/edge/pkg/common/message" "github.com/kubeedge/kubeedge/edge/pkg/common/modules" + deviceconfig "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/config" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dmiclient" "github.com/kubeedge/kubeedge/edge/pkg/devicetwin/dtcommon" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/dao" @@ -168,13 +169,19 @@ func CreateMessageTwinUpdate(twin *pb.Twin) ([]byte, error) { } func StartDMIServer(cache *DMICache) { - err := initSock(SockPath) + var DMISockPath string + if deviceconfig.Get().DeviceTwin.DMISockPath != "" { + DMISockPath = deviceconfig.Get().DeviceTwin.DMISockPath + } else { + DMISockPath = SockPath + } + err := initSock(DMISockPath) if err != nil { klog.Fatalf("failed to remove uds socket with err: %v", err) return } - lis, err := net.Listen(deviceconst.UnixNetworkType, SockPath) + lis, err := net.Listen(deviceconst.UnixNetworkType, DMISockPath) if err != nil { klog.Errorf("failed to start DMI Server with err: %v", err) return diff --git a/edge/test/integration/utils/test_setup.go b/edge/test/integration/utils/test_setup.go index 8890362f0..1d89ec713 100644 --- a/edge/test/integration/utils/test_setup.go +++ b/edge/test/integration/utils/test_setup.go @@ -40,6 +40,7 @@ func CreateEdgeCoreConfigFile(nodeName string) error { c.Modules.EdgeHub.TLSCAFile = "/tmp/edgecore/rootCA.crt" c.Modules.EdgeHub.TLSCertFile = "/tmp/edgecore/kubeedge.crt" c.Modules.EdgeHub.TLSPrivateKeyFile = "/tmp/edgecore/kubeedge.key" + c.Modules.DeviceTwin.DMISockPath = "/etc/kubeedge/dmi.sock" c.Modules.EventBus.Enable = true c.Modules.EventBus.MqttMode = edgecore.MqttModeInternal c.Modules.DBTest.Enable = true |