diff options
| author | Xiang Dai <long0dai@foxmail.com> | 2020-12-07 09:19:31 +0800 |
|---|---|---|
| committer | Xiang Dai <long0dai@foxmail.com> | 2020-12-07 15:00:31 +0800 |
| commit | 8cb2b338a4426119309a745088e7c4f693f45a50 (patch) | |
| tree | 8d8f9576d099bdb7d592e12c78f3f0e4fedcbe5d /edgemesh | |
| parent | Merge pull request #2402 from QinglongLee/develop (diff) | |
| download | kubeedge-8cb2b338a4426119309a745088e7c4f693f45a50.tar.gz | |
CI: fix panic and other existing issues
Signed-off-by: Xiang Dai <long0dai@foxmail.com>
Diffstat (limited to 'edgemesh')
| -rw-r--r-- | edgemesh/pkg/cache/cache.go | 2 | ||||
| -rw-r--r-- | edgemesh/pkg/listener/listener_test.go | 2 | ||||
| -rw-r--r-- | edgemesh/pkg/plugin/plugin.go | 4 | ||||
| -rw-r--r-- | edgemesh/pkg/plugin/registry/registry.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/edgemesh/pkg/cache/cache.go b/edgemesh/pkg/cache/cache.go index 63c31f6cb..4c110c610 100644 --- a/edgemesh/pkg/cache/cache.go +++ b/edgemesh/pkg/cache/cache.go @@ -1,6 +1,6 @@ package cache -import "github.com/hashicorp/golang-lru" +import lru "github.com/hashicorp/golang-lru" const DefaultCapacity = 20 diff --git a/edgemesh/pkg/listener/listener_test.go b/edgemesh/pkg/listener/listener_test.go index f8a070781..6197e26c6 100644 --- a/edgemesh/pkg/listener/listener_test.go +++ b/edgemesh/pkg/listener/listener_test.go @@ -3,7 +3,7 @@ package listener import ( "testing" - "github.com/hashicorp/golang-lru" + lru "github.com/hashicorp/golang-lru" v1 "k8s.io/api/core/v1" metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/edgemesh/pkg/plugin/plugin.go b/edgemesh/pkg/plugin/plugin.go index 9c6dd8c29..ee73e57e5 100644 --- a/edgemesh/pkg/plugin/plugin.go +++ b/edgemesh/pkg/plugin/plugin.go @@ -1,16 +1,16 @@ package plugin import ( - "k8s.io/klog/v2" - "github.com/go-chassis/go-archaius" "github.com/go-chassis/go-chassis/control" "github.com/go-chassis/go-chassis/core/config" "github.com/go-chassis/go-chassis/core/config/model" "github.com/go-chassis/go-chassis/core/loadbalancer" "github.com/go-chassis/go-chassis/core/registry" + "k8s.io/klog/v2" meshConfig "github.com/kubeedge/kubeedge/edgemesh/pkg/config" + // Register panel to aviod panic error _ "github.com/kubeedge/kubeedge/edgemesh/pkg/plugin/panel" meshRegistry "github.com/kubeedge/kubeedge/edgemesh/pkg/plugin/registry" diff --git a/edgemesh/pkg/plugin/registry/registry.go b/edgemesh/pkg/plugin/registry/registry.go index 59676df43..e061f7277 100644 --- a/edgemesh/pkg/plugin/registry/registry.go +++ b/edgemesh/pkg/plugin/registry/registry.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/go-chassis/go-chassis/core/registry" - "github.com/go-chassis/go-chassis/pkg/util/tags" + utiltags "github.com/go-chassis/go-chassis/pkg/util/tags" v1 "k8s.io/api/core/v1" "k8s.io/klog/v2" |