diff options
| -rw-r--r-- | edge/pkg/metamanager/metaserver/server.go | 26 | ||||
| -rw-r--r-- | edge/pkg/metamanager/metaserver/server_linux.go | 34 | ||||
| -rw-r--r-- | edge/pkg/metamanager/metaserver/server_other.go | 7 | ||||
| -rw-r--r-- | pkg/util/dummy_device_linux.go (renamed from pkg/util/dummy_device.go) | 0 |
4 files changed, 42 insertions, 25 deletions
diff --git a/edge/pkg/metamanager/metaserver/server.go b/edge/pkg/metamanager/metaserver/server.go index 739171e28..308c92bcc 100644 --- a/edge/pkg/metamanager/metaserver/server.go +++ b/edge/pkg/metamanager/metaserver/server.go @@ -42,8 +42,7 @@ import ( "github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/handlerfactory" "github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/kubernetes/serializer" kefeatures "github.com/kubeedge/kubeedge/pkg/features" - "github.com/kubeedge/kubeedge/pkg/util" - "github.com/kubeedge/kubeedge/pkg/util/pass-through" + passthrough "github.com/kubeedge/kubeedge/pkg/util/pass-through" ) // MetaServer is simplification of server.GenericAPIServer @@ -295,26 +294,3 @@ func (ls *MetaServer) makeTLSConfig() (*tls.Config, error) { }, }, nil } - -func setupDummyInterface() error { - dummyIP, dummyPort, err := net.SplitHostPort(metaserverconfig.Config.DummyServer) - if err != nil { - return err - } - - if err := os.Setenv("METASERVER_DUMMY_IP", dummyIP); err != nil { - return err - } - if err := os.Setenv("METASERVER_DUMMY_PORT", dummyPort); err != nil { - return err - } - - manager := util.NewDummyDeviceManager() - _, err = manager.EnsureDummyDevice("edge-dummy0") - if err != nil { - return err - } - - _, err = manager.EnsureAddressBind(dummyIP, "edge-dummy0") - return err -} diff --git a/edge/pkg/metamanager/metaserver/server_linux.go b/edge/pkg/metamanager/metaserver/server_linux.go new file mode 100644 index 000000000..68a1c9a37 --- /dev/null +++ b/edge/pkg/metamanager/metaserver/server_linux.go @@ -0,0 +1,34 @@ +//go:build linux + +package metaserver + +import ( + "net" + "os" + + metaserverconfig "github.com/kubeedge/kubeedge/edge/pkg/metamanager/metaserver/config" + "github.com/kubeedge/kubeedge/pkg/util" +) + +func setupDummyInterface() error { + dummyIP, dummyPort, err := net.SplitHostPort(metaserverconfig.Config.DummyServer) + if err != nil { + return err + } + + if err := os.Setenv("METASERVER_DUMMY_IP", dummyIP); err != nil { + return err + } + if err := os.Setenv("METASERVER_DUMMY_PORT", dummyPort); err != nil { + return err + } + + manager := util.NewDummyDeviceManager() + _, err = manager.EnsureDummyDevice("edge-dummy0") + if err != nil { + return err + } + + _, err = manager.EnsureAddressBind(dummyIP, "edge-dummy0") + return err +} diff --git a/edge/pkg/metamanager/metaserver/server_other.go b/edge/pkg/metamanager/metaserver/server_other.go new file mode 100644 index 000000000..a7fbab19d --- /dev/null +++ b/edge/pkg/metamanager/metaserver/server_other.go @@ -0,0 +1,7 @@ +//go:build !linux + +package metaserver + +func setupDummyInterface() error { + return nil +} diff --git a/pkg/util/dummy_device.go b/pkg/util/dummy_device_linux.go index beb3f52e3..beb3f52e3 100644 --- a/pkg/util/dummy_device.go +++ b/pkg/util/dummy_device_linux.go |
