summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang Dai <long0dai@foxmail.com>2020-12-07 09:19:31 +0800
committerXiang Dai <long0dai@foxmail.com>2020-12-07 15:00:31 +0800
commit8cb2b338a4426119309a745088e7c4f693f45a50 (patch)
tree8d8f9576d099bdb7d592e12c78f3f0e4fedcbe5d
parentMerge pull request #2402 from QinglongLee/develop (diff)
downloadkubeedge-8cb2b338a4426119309a745088e7c4f693f45a50.tar.gz
CI: fix panic and other existing issues
Signed-off-by: Xiang Dai <long0dai@foxmail.com>
-rw-r--r--.golangci.yml2
-rw-r--r--cloud/cmd/admission/app/server.go1
-rw-r--r--cloud/pkg/cloudhub/common/model/types.go4
-rw-r--r--[-rwxr-xr-x]cloud/pkg/cloudhub/handler/messagehandler.go0
-rw-r--r--cloud/pkg/cloudhub/servers/httpserver/secretsutil.go14
-rw-r--r--cloud/pkg/devicecontroller/constants/default.go2
-rw-r--r--cloud/pkg/devicecontroller/utils/crdclient.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/configmap.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/endpoint.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/location.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/location_test.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/node.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/pod.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/secret.go2
-rw-r--r--cloud/pkg/edgecontroller/manager/service.go2
-rw-r--r--[-rwxr-xr-x]cloud/pkg/leaderelection/leaderelection.go3
-rw-r--r--cloud/test/integration/fixtures/device.go2
-rw-r--r--common/types/types.go2
-rw-r--r--edge/pkg/devicetwin/dtmanager/communicate.go2
-rw-r--r--edge/pkg/edged/clcm/internal_life_cycle.go2
-rw-r--r--edge/pkg/edged/edged.go7
-rw-r--r--edge/pkg/edged/edgedtypes/types.go2
-rw-r--r--edge/pkg/edged/securitycontext/provider.go2
-rw-r--r--edge/pkg/edged/securitycontext/types.go2
-rw-r--r--edge/pkg/edged/status/status_manager.go2
-rw-r--r--edge/pkg/metamanager/process.go2
-rw-r--r--edge/test/cloudhub/stub.go2
-rw-r--r--[-rwxr-xr-x]edge/test/integration/appdeployment/application_test.go2
-rw-r--r--edge/test/integration/utils/helpers/helpers.go2
-rw-r--r--edge/test/test.go2
-rw-r--r--edgemesh/pkg/cache/cache.go2
-rw-r--r--edgemesh/pkg/listener/listener_test.go2
-rw-r--r--edgemesh/pkg/plugin/plugin.go4
-rw-r--r--edgemesh/pkg/plugin/registry/registry.go2
-rw-r--r--keadm/cmd/keadm/app/cmd/debug/check.go96
-rw-r--r--keadm/cmd/keadm/app/cmd/debug/collect.go22
-rw-r--r--keadm/cmd/keadm/app/cmd/debug/diagnose.go60
-rw-r--r--keadm/cmd/keadm/app/cmd/debug/get.go2
-rw-r--r--keadm/cmd/keadm/app/cmd/reset.go11
-rw-r--r--mappers/bluetooth_mapper/action_manager/action_manager.go2
-rw-r--r--mappers/bluetooth_mapper/configuration/config.go4
-rw-r--r--mappers/bluetooth_mapper/controller/controller.go4
-rw-r--r--mappers/bluetooth_mapper/watcher/watcher.go4
-rw-r--r--mappers/common/event_test.go55
-rw-r--r--mappers/modbus-go/configmap/parse.go3
-rw-r--r--mappers/modbus-go/configmap/parse_test.go3
-rw-r--r--mappers/modbus-go/device/device.go4
-rw-r--r--mappers/modbus-go/device/devstatus.go3
-rw-r--r--mappers/modbus-go/device/twindata.go3
-rw-r--r--mappers/modbus-go/main.go3
-rw-r--r--tests/e2e/utils/node.go2
-rw-r--r--tests/performance/loadtest/loadtest_test.go2
52 files changed, 156 insertions, 214 deletions
diff --git a/.golangci.yml b/.golangci.yml
index ebc6e5141..cd1908964 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -39,7 +39,7 @@ output:
linters-settings:
gci:
- local-prefixes: github.com/kubeedge/kubeedge
+ local-prefixes: github.com/kubeedge
misspell:
ignore-words:
- mosquitto
diff --git a/cloud/cmd/admission/app/server.go b/cloud/cmd/admission/app/server.go
index 908aafac1..1ada235b1 100644
--- a/cloud/cmd/admission/app/server.go
+++ b/cloud/cmd/admission/app/server.go
@@ -2,6 +2,7 @@ package app
import (
"fmt"
+
"github.com/spf13/cobra"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/cli/globalflag"
diff --git a/cloud/pkg/cloudhub/common/model/types.go b/cloud/pkg/cloudhub/common/model/types.go
index 220816429..3d7ddae43 100644
--- a/cloud/pkg/cloudhub/common/model/types.go
+++ b/cloud/pkg/cloudhub/common/model/types.go
@@ -1,13 +1,13 @@
package model
import (
+
// Mapping value of json to struct member
_ "encoding/json"
"fmt"
"strings"
"github.com/kubeedge/beehive/pkg/core/model"
- beehiveModel "github.com/kubeedge/beehive/pkg/core/model"
"github.com/kubeedge/kubeedge/cloud/pkg/common/modules"
edgemessagelayer "github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/messagelayer"
)
@@ -85,7 +85,7 @@ func NewResource(resType, resID string, info *HubInfo) string {
// IsNodeStopped indicates if the node is stopped or running
func IsNodeStopped(msg *model.Message) bool {
resourceType, _ := edgemessagelayer.GetResourceType(*msg)
- if resourceType != beehiveModel.ResourceTypeNode {
+ if resourceType != model.ResourceTypeNode {
return false
}
diff --git a/cloud/pkg/cloudhub/handler/messagehandler.go b/cloud/pkg/cloudhub/handler/messagehandler.go
index b8edac930..b8edac930 100755..100644
--- a/cloud/pkg/cloudhub/handler/messagehandler.go
+++ b/cloud/pkg/cloudhub/handler/messagehandler.go
diff --git a/cloud/pkg/cloudhub/servers/httpserver/secretsutil.go b/cloud/pkg/cloudhub/servers/httpserver/secretsutil.go
index 91bee83cb..7d6f96761 100644
--- a/cloud/pkg/cloudhub/servers/httpserver/secretsutil.go
+++ b/cloud/pkg/cloudhub/servers/httpserver/secretsutil.go
@@ -5,9 +5,7 @@ import (
"fmt"
corev1 "k8s.io/api/core/v1"
- v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
- apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
@@ -27,7 +25,7 @@ const (
CloudCoreKeyDataName string = "cloudcorekeydata"
)
-func GetSecret(secretName string, ns string) (*v1.Secret, error) {
+func GetSecret(secretName string, ns string) (*corev1.Secret, error) {
cli, err := utils.KubeClient()
if err != nil {
return nil, fmt.Errorf("failed to create KubeClient, error: %s", err)
@@ -36,7 +34,7 @@ func GetSecret(secretName string, ns string) (*v1.Secret, error) {
}
// CreateSecret creates a secret
-func CreateSecret(secret *v1.Secret, ns string) error {
+func CreateSecret(secret *corev1.Secret, ns string) error {
cli, err := utils.KubeClient()
if err != nil {
return fmt.Errorf("failed to create KubeClient, error: %s", err)
@@ -45,7 +43,7 @@ func CreateSecret(secret *v1.Secret, ns string) error {
return fmt.Errorf("failed to create Namespace kubeedge, error: %s", err)
}
if _, err := cli.CoreV1().Secrets(ns).Create(context.Background(), secret, metav1.CreateOptions{}); err != nil {
- if apierrors.IsAlreadyExists(err) {
+ if errors.IsAlreadyExists(err) {
if _, err := cli.CoreV1().Secrets(ns).Update(context.Background(), secret, metav1.UpdateOptions{}); err != nil {
return fmt.Errorf("failed to update the secret, namespace: %s, name: %s, err: %v", ns, secret.Name, err)
}
@@ -57,7 +55,7 @@ func CreateSecret(secret *v1.Secret, ns string) error {
}
func CreateTokenSecret(caHashAndToken []byte) error {
- token := &v1.Secret{
+ token := &corev1.Secret{
TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: "v1"},
ObjectMeta: metav1.ObjectMeta{
Name: TokenSecretName,
@@ -73,7 +71,7 @@ func CreateTokenSecret(caHashAndToken []byte) error {
}
func CreateCaSecret(certDER, key []byte) error {
- caSecret := &v1.Secret{
+ caSecret := &corev1.Secret{
TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: "v1"},
ObjectMeta: metav1.ObjectMeta{
Name: CaSecretName,
@@ -90,7 +88,7 @@ func CreateCaSecret(certDER, key []byte) error {
}
func CreateCloudCoreSecret(certDER, key []byte) error {
- cloudCoreCert := &v1.Secret{
+ cloudCoreCert := &corev1.Secret{
TypeMeta: metav1.TypeMeta{Kind: "Secret", APIVersion: "v1"},
ObjectMeta: metav1.ObjectMeta{
Name: CloudCoreSecretName,
diff --git a/cloud/pkg/devicecontroller/constants/default.go b/cloud/pkg/devicecontroller/constants/default.go
index b9c487c48..93680f68f 100644
--- a/cloud/pkg/devicecontroller/constants/default.go
+++ b/cloud/pkg/devicecontroller/constants/default.go
@@ -1,7 +1,7 @@
package constants
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
)
// Config
diff --git a/cloud/pkg/devicecontroller/utils/crdclient.go b/cloud/pkg/devicecontroller/utils/crdclient.go
index 4d9084371..50b2fb8bb 100644
--- a/cloud/pkg/devicecontroller/utils/crdclient.go
+++ b/cloud/pkg/devicecontroller/utils/crdclient.go
@@ -1,7 +1,7 @@
package utils
import (
- "k8s.io/apimachinery/pkg/apis/meta/v1"
+ v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/client-go/rest"
diff --git a/cloud/pkg/edgecontroller/manager/configmap.go b/cloud/pkg/edgecontroller/manager/configmap.go
index b3bc59fb7..48f696169 100644
--- a/cloud/pkg/edgecontroller/manager/configmap.go
+++ b/cloud/pkg/edgecontroller/manager/configmap.go
@@ -1,7 +1,7 @@
package manager
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
diff --git a/cloud/pkg/edgecontroller/manager/endpoint.go b/cloud/pkg/edgecontroller/manager/endpoint.go
index 2241e140b..5a5b87520 100644
--- a/cloud/pkg/edgecontroller/manager/endpoint.go
+++ b/cloud/pkg/edgecontroller/manager/endpoint.go
@@ -1,7 +1,7 @@
package manager
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
diff --git a/cloud/pkg/edgecontroller/manager/location.go b/cloud/pkg/edgecontroller/manager/location.go
index b623b3a4e..187fb8300 100644
--- a/cloud/pkg/edgecontroller/manager/location.go
+++ b/cloud/pkg/edgecontroller/manager/location.go
@@ -5,7 +5,7 @@ import (
"reflect"
"sync"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
)
// LocationCache cache the map of node, pod, configmap, secret
diff --git a/cloud/pkg/edgecontroller/manager/location_test.go b/cloud/pkg/edgecontroller/manager/location_test.go
index 80559f791..ff58a610d 100644
--- a/cloud/pkg/edgecontroller/manager/location_test.go
+++ b/cloud/pkg/edgecontroller/manager/location_test.go
@@ -20,7 +20,7 @@ import (
"reflect"
"testing"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
diff --git a/cloud/pkg/edgecontroller/manager/node.go b/cloud/pkg/edgecontroller/manager/node.go
index f3a23114e..1fc85864c 100644
--- a/cloud/pkg/edgecontroller/manager/node.go
+++ b/cloud/pkg/edgecontroller/manager/node.go
@@ -1,7 +1,7 @@
package manager
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/edgecontroller/manager/pod.go b/cloud/pkg/edgecontroller/manager/pod.go
index aa29960aa..105198e48 100644
--- a/cloud/pkg/edgecontroller/manager/pod.go
+++ b/cloud/pkg/edgecontroller/manager/pod.go
@@ -4,7 +4,7 @@ import (
"reflect"
"sync"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/watch"
diff --git a/cloud/pkg/edgecontroller/manager/secret.go b/cloud/pkg/edgecontroller/manager/secret.go
index 658930da5..9ca59c1f2 100644
--- a/cloud/pkg/edgecontroller/manager/secret.go
+++ b/cloud/pkg/edgecontroller/manager/secret.go
@@ -1,7 +1,7 @@
package manager
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
diff --git a/cloud/pkg/edgecontroller/manager/service.go b/cloud/pkg/edgecontroller/manager/service.go
index 9e2251777..4881dbd5d 100644
--- a/cloud/pkg/edgecontroller/manager/service.go
+++ b/cloud/pkg/edgecontroller/manager/service.go
@@ -1,7 +1,7 @@
package manager
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/fields"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
diff --git a/cloud/pkg/leaderelection/leaderelection.go b/cloud/pkg/leaderelection/leaderelection.go
index a194d6650..c485c4951 100755..100644
--- a/cloud/pkg/leaderelection/leaderelection.go
+++ b/cloud/pkg/leaderelection/leaderelection.go
@@ -13,7 +13,6 @@ import (
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/util/uuid"
- "k8s.io/client-go/kubernetes"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/leaderelection"
@@ -201,7 +200,7 @@ func TriggerGracefulShutdown() {
}
}
-func CreateNamespaceIfNeeded(cli *kubernetes.Clientset, ns string) error {
+func CreateNamespaceIfNeeded(cli *clientset.Clientset, ns string) error {
c := cli.CoreV1()
if _, err := c.Namespaces().Get(context.Background(), ns, metav1.GetOptions{}); err == nil {
// the namespace already exists
diff --git a/cloud/test/integration/fixtures/device.go b/cloud/test/integration/fixtures/device.go
index f554d3a00..8d3d2717b 100644
--- a/cloud/test/integration/fixtures/device.go
+++ b/cloud/test/integration/fixtures/device.go
@@ -17,7 +17,7 @@ limitations under the License.
package fixtures
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/kubeedge/kubeedge/cloud/pkg/apis/devices/v1alpha2"
diff --git a/common/types/types.go b/common/types/types.go
index 7ac2d054c..61fa79272 100644
--- a/common/types/types.go
+++ b/common/types/types.go
@@ -1,7 +1,7 @@
package types
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
)
diff --git a/edge/pkg/devicetwin/dtmanager/communicate.go b/edge/pkg/devicetwin/dtmanager/communicate.go
index 831d109bc..8e12df823 100644
--- a/edge/pkg/devicetwin/dtmanager/communicate.go
+++ b/edge/pkg/devicetwin/dtmanager/communicate.go
@@ -6,9 +6,9 @@ import (
"strings"
"time"
+ "github.com/google/uuid"
"k8s.io/klog/v2"
- "github.com/google/uuid"
beehiveContext "github.com/kubeedge/beehive/pkg/core/context"
"github.com/kubeedge/beehive/pkg/core/model"
connect "github.com/kubeedge/kubeedge/edge/pkg/common/cloudconnection"
diff --git a/edge/pkg/edged/clcm/internal_life_cycle.go b/edge/pkg/edged/clcm/internal_life_cycle.go
index 8f525deb5..dee2e3153 100644
--- a/edge/pkg/edged/clcm/internal_life_cycle.go
+++ b/edge/pkg/edged/clcm/internal_life_cycle.go
@@ -21,7 +21,7 @@ This file is derived from K8S Kubelet code with reduced set of methods
package clcm
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
utilfeature "k8s.io/apiserver/pkg/util/feature"
kubefeatures "k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/cm/cpumanager"
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go
index 33b19557b..f4bf45ebf 100644
--- a/edge/pkg/edged/edged.go
+++ b/edge/pkg/edged/edged.go
@@ -34,13 +34,10 @@ import (
"sync"
"time"
- cadvisorapi2 "github.com/google/cadvisor/info/v2"
- "k8s.io/kubernetes/pkg/kubelet/logs"
- "k8s.io/kubernetes/pkg/kubelet/runtimeclass"
-
"github.com/container-storage-interface/spec/lib/go/csi"
"github.com/golang/protobuf/jsonpb"
cadvisorapi "github.com/google/cadvisor/info/v1"
+ cadvisorapi2 "github.com/google/cadvisor/info/v2"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
@@ -69,12 +66,14 @@ import (
"k8s.io/kubernetes/pkg/kubelet/kuberuntime"
"k8s.io/kubernetes/pkg/kubelet/legacy"
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
+ "k8s.io/kubernetes/pkg/kubelet/logs"
kubedns "k8s.io/kubernetes/pkg/kubelet/network/dns"
"k8s.io/kubernetes/pkg/kubelet/pleg"
"k8s.io/kubernetes/pkg/kubelet/pluginmanager"
plugincache "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
"k8s.io/kubernetes/pkg/kubelet/prober"
proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results"
+ "k8s.io/kubernetes/pkg/kubelet/runtimeclass"
serverstats "k8s.io/kubernetes/pkg/kubelet/server/stats"
"k8s.io/kubernetes/pkg/kubelet/stats"
kubestatus "k8s.io/kubernetes/pkg/kubelet/status"
diff --git a/edge/pkg/edged/edgedtypes/types.go b/edge/pkg/edged/edgedtypes/types.go
index 92629b838..dbacc4184 100644
--- a/edge/pkg/edged/edgedtypes/types.go
+++ b/edge/pkg/edged/edgedtypes/types.go
@@ -1,7 +1,7 @@
package edgedtypes
import (
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/types"
)
diff --git a/edge/pkg/edged/securitycontext/provider.go b/edge/pkg/edged/securitycontext/provider.go
index 49e2e1850..c794e75cc 100644
--- a/edge/pkg/edged/securitycontext/provider.go
+++ b/edge/pkg/edged/securitycontext/provider.go
@@ -4,7 +4,7 @@ import (
"strconv"
"github.com/docker/docker/api/types/container"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
)
//SimpleSecurityContextProvider is object ot define security context provider
diff --git a/edge/pkg/edged/securitycontext/types.go b/edge/pkg/edged/securitycontext/types.go
index 98d711dc9..c77e65be3 100644
--- a/edge/pkg/edged/securitycontext/types.go
+++ b/edge/pkg/edged/securitycontext/types.go
@@ -2,7 +2,7 @@ package securitycontext
import (
"github.com/docker/docker/api/types/container"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
)
//Provider is interface for security context modification
diff --git a/edge/pkg/edged/status/status_manager.go b/edge/pkg/edged/status/status_manager.go
index 93213d936..6d3b97313 100644
--- a/edge/pkg/edged/status/status_manager.go
+++ b/edge/pkg/edged/status/status_manager.go
@@ -3,7 +3,7 @@ package status
import (
"time"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
diff --git a/edge/pkg/metamanager/process.go b/edge/pkg/metamanager/process.go
index 15ad76d15..11fb8775f 100644
--- a/edge/pkg/metamanager/process.go
+++ b/edge/pkg/metamanager/process.go
@@ -6,7 +6,7 @@ import (
"strings"
"time"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"
"github.com/kubeedge/beehive/pkg/common/util"
diff --git a/edge/test/cloudhub/stub.go b/edge/test/cloudhub/stub.go
index 6f5f79460..dec21dd85 100644
--- a/edge/test/cloudhub/stub.go
+++ b/edge/test/cloudhub/stub.go
@@ -8,7 +8,7 @@ import (
"github.com/gorilla/mux"
"github.com/gorilla/websocket"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"
"github.com/kubeedge/beehive/pkg/core"
diff --git a/edge/test/integration/appdeployment/application_test.go b/edge/test/integration/appdeployment/application_test.go
index 72cb2913d..6b51020b4 100755..100644
--- a/edge/test/integration/appdeployment/application_test.go
+++ b/edge/test/integration/appdeployment/application_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/intstr"
diff --git a/edge/test/integration/utils/helpers/helpers.go b/edge/test/integration/utils/helpers/helpers.go
index f18c6f628..cd1144943 100644
--- a/edge/test/integration/utils/helpers/helpers.go
+++ b/edge/test/integration/utils/helpers/helpers.go
@@ -28,7 +28,7 @@ import (
MQTT "github.com/eclipse/paho.mqtt.golang"
"github.com/onsi/gomega"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
diff --git a/edge/test/test.go b/edge/test/test.go
index ac9bf6ce8..234901aa4 100644
--- a/edge/test/test.go
+++ b/edge/test/test.go
@@ -7,7 +7,7 @@ import (
"net/http"
"time"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2"
"github.com/kubeedge/beehive/pkg/core"
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"
diff --git a/keadm/cmd/keadm/app/cmd/debug/check.go b/keadm/cmd/keadm/app/cmd/debug/check.go
index 7f236aadb..a3e551daf 100644
--- a/keadm/cmd/keadm/app/cmd/debug/check.go
+++ b/keadm/cmd/keadm/app/cmd/debug/check.go
@@ -18,8 +18,6 @@ import (
"github.com/spf13/cobra"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- constant "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
)
@@ -58,17 +56,17 @@ and maintenance personnel to locate the problem`
`
)
-type CheckObject types.CheckObject
+type CheckObject common.CheckObject
// NewEdgecheck returns KubeEdge edge check command.
-func NewCheck(out io.Writer, collectOptions *types.CheckOptions) *cobra.Command {
+func NewCheck(out io.Writer, collectOptions *common.CheckOptions) *cobra.Command {
cmd := &cobra.Command{
Use: "check",
Short: edgeCheckShortDescription,
Long: edgeCheckLongDescription,
Example: edgeCheckExample,
}
- for _, v := range constant.CheckObjectMap {
+ for _, v := range common.CheckObjectMap {
cmd.AddCommand(NewSubEdgeCheck(out, CheckObject(v)))
}
return cmd
@@ -85,23 +83,23 @@ func NewSubEdgeCheck(out io.Writer, object CheckObject) *cobra.Command {
},
}
switch object.Use {
- case constant.ArgCheckAll:
+ case common.ArgCheckAll:
cmd.Flags().StringVarP(&co.Domain, "domain", "d", co.Domain, "specify test domain")
cmd.Flags().StringVarP(&co.IP, "ip", "i", co.IP, "specify test ip")
cmd.Flags().StringVarP(&co.CloudHubServer, "cloud-hub-server", "s", co.CloudHubServer, "specify cloudhub server")
cmd.Flags().StringVarP(&co.Runtime, "runtime", "r", co.Runtime, "specify test runtime")
cmd.Flags().StringVarP(&co.DNSIP, "dns-ip", "D", co.DNSIP, "specify test dns ip")
- cmd.Flags().StringVarP(&co.Config, constant.EdgecoreConfig, "c", co.Config,
+ cmd.Flags().StringVarP(&co.Config, common.EdgecoreConfig, "c", co.Config,
fmt.Sprintf("Specify configuration file, defalut is %s", common.EdgecoreConfigPath))
- case constant.ArgCheckDNS:
+ case common.ArgCheckDNS:
cmd.Flags().StringVarP(&co.Domain, "domain", "d", co.Domain, "specify test domain")
cmd.Flags().StringVarP(&co.DNSIP, "dns-ip", "D", co.DNSIP, "specify test dns ip")
- case constant.ArgCheckNetwork:
+ case common.ArgCheckNetwork:
cmd.Flags().StringVarP(&co.IP, "ip", "i", co.IP, "specify test ip")
cmd.Flags().StringVarP(&co.CloudHubServer, "cloud-hub-server", "s", co.CloudHubServer, "specify cloudhub server")
- cmd.Flags().StringVarP(&co.Config, constant.EdgecoreConfig, "c", co.Config,
+ cmd.Flags().StringVarP(&co.Config, common.EdgecoreConfig, "c", co.Config,
fmt.Sprintf("Specify configuration file, defalut is %s", common.EdgecoreConfigPath))
- case constant.ArgCheckRuntime:
+ case common.ArgCheckRuntime:
cmd.Flags().StringVarP(&co.Runtime, "runtime", "r", co.Runtime, "specify test runtime")
}
@@ -109,50 +107,50 @@ func NewSubEdgeCheck(out io.Writer, object CheckObject) *cobra.Command {
}
// Add flags
-func NewCheckOptins() *types.CheckOptions {
- co := &types.CheckOptions{}
- co.Runtime = types.DefaultRuntime
+func NewCheckOptins() *common.CheckOptions {
+ co := &common.CheckOptions{}
+ co.Runtime = common.DefaultRuntime
co.Domain = "www.github.com"
co.Timeout = 1
return co
}
// Start to check data
-func (co *CheckObject) ExecuteCheck(use string, ob *types.CheckOptions) {
+func (co *CheckObject) ExecuteCheck(use string, ob *common.CheckOptions) {
err := fmt.Errorf("")
if ob.Config == "" {
- ob.Config = types.EdgecoreConfigPath
+ ob.Config = common.EdgecoreConfigPath
}
switch use {
- case constant.ArgCheckAll:
+ case common.ArgCheckAll:
err = CheckAll(ob)
- case constant.ArgCheckCPU:
+ case common.ArgCheckCPU:
err = CheckCPU()
- case constant.ArgCheckMemory:
+ case common.ArgCheckMemory:
err = CheckMemory()
- case constant.ArgCheckDisk:
+ case common.ArgCheckDisk:
err = CheckDisk()
- case constant.ArgCheckDNS:
+ case common.ArgCheckDNS:
err = CheckDNSSpecify(ob.Domain, ob.DNSIP)
- case constant.ArgCheckNetwork:
+ case common.ArgCheckNetwork:
err = CheckNetWork(ob.IP, ob.Timeout, ob.CloudHubServer, ob.EdgecoreServer, ob.Config)
- case constant.ArgCheckRuntime:
+ case common.ArgCheckRuntime:
err = CheckRuntime(ob.Runtime)
- case constant.ArgCheckPID:
+ case common.ArgCheckPID:
err = CheckPid()
}
if err != nil {
fmt.Println(err)
- util.PrintFail(use, constant.StrCheck)
+ util.PrintFail(use, common.StrCheck)
} else {
- util.PrintSuccedd(use, constant.StrCheck)
+ util.PrintSuccedd(use, common.StrCheck)
}
}
-func CheckAll(ob *types.CheckOptions) error {
+func CheckAll(ob *common.CheckOptions) error {
err := CheckCPU()
if err != nil {
return err
@@ -201,10 +199,10 @@ func CheckCPU() error {
return err
}
- fmt.Printf("CPU total: %v core, Allowed > %v core\n", cpuNum, constant.AllowedValueCPU)
- fmt.Printf("CPU usage rate: %.2f, Allowed rate < %v\n", percent[0]/100, constant.AllowedCurrentValueCPURate)
+ fmt.Printf("CPU total: %v core, Allowed > %v core\n", cpuNum, common.AllowedValueCPU)
+ fmt.Printf("CPU usage rate: %.2f, Allowed rate < %v\n", percent[0]/100, common.AllowedCurrentValueCPURate)
- if cpuNum < constant.AllowedValueCPU || percent[0]/100 > constant.AllowedCurrentValueCPURate {
+ if cpuNum < common.AllowedValueCPU || percent[0]/100 > common.AllowedCurrentValueCPURate {
return errors.New("cpu check failed")
}
return nil
@@ -216,14 +214,14 @@ func CheckMemory() error {
return err
}
- fmt.Printf("Memory total: %.2f MB, Allowed > %v MB\n", float32(mem.Total)/constant.MB, constant.AllowedValueMemory/constant.MB)
- fmt.Printf("Memory Free total: %.2f MB, Allowed > %v MB\n", float32(mem.Free)/constant.MB, constant.AllowedCurrentValueMem/constant.MB)
+ fmt.Printf("Memory total: %.2f MB, Allowed > %v MB\n", float32(mem.Total)/common.MB, common.AllowedValueMemory/common.MB)
+ fmt.Printf("Memory Free total: %.2f MB, Allowed > %v MB\n", float32(mem.Free)/common.MB, common.AllowedCurrentValueMem/common.MB)
fmt.Printf("Memory usage rate: %.2f, Allowed rate < %v\n", mem.UsedPercent/100,
- constant.AllowedCurrentValueMemRate)
+ common.AllowedCurrentValueMemRate)
- if mem.Total < constant.AllowedValueMemory ||
- mem.Free < constant.AllowedCurrentValueMem ||
- mem.UsedPercent/100 > constant.AllowedCurrentValueMemRate {
+ if mem.Total < common.AllowedValueMemory ||
+ mem.Free < common.AllowedCurrentValueMem ||
+ mem.UsedPercent/100 > common.AllowedCurrentValueMemRate {
return errors.New("memory check failed")
}
@@ -241,13 +239,13 @@ func CheckDisk() error {
return err
}
- fmt.Printf("Disk total: %.2f MB, Allowed > %v MB\n", float32(diskInfo.Total)/constant.MB, constant.AllowedValueDisk/constant.MB)
- fmt.Printf("Disk Free total: %.2f MB, Allowed > %vMB\n", float32(diskInfo.Free)/constant.MB, constant.AllowedCurrentValueDisk/constant.MB)
- fmt.Printf("Disk usage rate: %.2f, Allowed rate < %v\n", diskInfo.UsedPercent/100, constant.AllowedCurrentValueDiskRate)
+ fmt.Printf("Disk total: %.2f MB, Allowed > %v MB\n", float32(diskInfo.Total)/common.MB, common.AllowedValueDisk/common.MB)
+ fmt.Printf("Disk Free total: %.2f MB, Allowed > %vMB\n", float32(diskInfo.Free)/common.MB, common.AllowedCurrentValueDisk/common.MB)
+ fmt.Printf("Disk usage rate: %.2f, Allowed rate < %v\n", diskInfo.UsedPercent/100, common.AllowedCurrentValueDiskRate)
- if diskInfo.Total < constant.AllowedValueDisk ||
- diskInfo.Free < constant.AllowedCurrentValueDisk ||
- diskInfo.UsedPercent/100 > constant.AllowedCurrentValueDiskRate {
+ if diskInfo.Total < common.AllowedValueDisk ||
+ diskInfo.Free < common.AllowedCurrentValueDisk ||
+ diskInfo.UsedPercent/100 > common.AllowedCurrentValueDiskRate {
return errors.New("disk check failed")
}
@@ -299,14 +297,14 @@ func CheckNetWork(IP string, timeout int, cloudhubServer string, edgecoreServer
}
if IP == "" {
- result, err := util.ExecShellFilter(constant.CmdGetDNSIP)
+ result, err := util.ExecShellFilter(common.CmdGetDNSIP)
if err != nil {
return err
}
IP = result
}
if IP != "" {
- result, err := util.ExecShellFilter(fmt.Sprintf(constant.CmdPing, IP, timeout))
+ result, err := util.ExecShellFilter(fmt.Sprintf(common.CmdPing, IP, timeout))
if err != nil {
return err
@@ -353,8 +351,8 @@ func CheckHTTP(url string) error {
}
func CheckRuntime(runtime string) error {
- if runtime == types.DefaultRuntime {
- result, err := util.ExecShellFilter(constant.CmdGetStatusDocker)
+ if runtime == common.DefaultRuntime {
+ result, err := util.ExecShellFilter(common.CmdGetStatusDocker)
if err != nil {
return err
}
@@ -369,18 +367,18 @@ func CheckRuntime(runtime string) error {
}
func CheckPid() error {
- rMax, err := util.ExecShellFilter(constant.CmdGetMaxProcessNum)
+ rMax, err := util.ExecShellFilter(common.CmdGetMaxProcessNum)
if err != nil {
return err
}
- r, err := util.ExecShellFilter(constant.CmdGetProcessNum)
+ r, err := util.ExecShellFilter(common.CmdGetProcessNum)
if err != nil {
return err
}
vMax, err := strconv.ParseFloat(rMax, 32)
v, err := strconv.ParseFloat(r, 32)
rate := (1 - v/vMax)
- if rate > constant.AllowedValuePIDRate {
+ if rate > common.AllowedValuePIDRate {
fmt.Printf("Maximum PIDs: %s; Running processes: %s\n", rMax, r)
return nil
}
diff --git a/keadm/cmd/keadm/app/cmd/debug/collect.go b/keadm/cmd/keadm/app/cmd/debug/collect.go
index 13d3789ad..678eae6ef 100644
--- a/keadm/cmd/keadm/app/cmd/debug/collect.go
+++ b/keadm/cmd/keadm/app/cmd/debug/collect.go
@@ -8,12 +8,12 @@ import (
"path/filepath"
"time"
+ "github.com/spf13/cobra"
+
"github.com/kubeedge/kubeedge/common/constants"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1"
- "github.com/spf13/cobra"
)
var (
@@ -28,7 +28,7 @@ keadm debug collect --output-path .
var pringDeatilFlag = false
// NewCollect returns KubeEdge collect command.
-func NewCollect(out io.Writer, collectOptions *types.CollectOptions) *cobra.Command {
+func NewCollect(out io.Writer, collectOptions *common.CollectOptions) *cobra.Command {
if collectOptions == nil {
collectOptions = newCollectOptions()
}
@@ -51,8 +51,8 @@ func NewCollect(out io.Writer, collectOptions *types.CollectOptions) *cobra.Comm
}
// dd flags
-func addCollectOtherFlags(cmd *cobra.Command, collectOptions *types.CollectOptions) {
- cmd.Flags().StringVarP(&collectOptions.Config, types.EdgecoreConfig, "c", collectOptions.Config,
+func addCollectOtherFlags(cmd *cobra.Command, collectOptions *common.CollectOptions) {
+ cmd.Flags().StringVarP(&collectOptions.Config, common.EdgecoreConfig, "c", collectOptions.Config,
fmt.Sprintf("Specify configuration file, defalut is %s", common.EdgecoreConfigPath))
cmd.Flags().BoolVarP(&collectOptions.Detail, "detail", "d", false,
"Whether to print internal log output")
@@ -65,17 +65,17 @@ func addCollectOtherFlags(cmd *cobra.Command, collectOptions *types.CollectOptio
}
// newCollectOptions returns a struct ready for being used for creating cmd collect flags.
-func newCollectOptions() *types.CollectOptions {
- opts := &types.CollectOptions{}
+func newCollectOptions() *common.CollectOptions {
+ opts := &common.CollectOptions{}
- opts.Config = types.EdgecoreConfigPath
+ opts.Config = common.EdgecoreConfigPath
opts.OutputPath = "."
opts.Detail = false
return opts
}
//Start to collect data
-func ExecuteCollect(collectOptions *types.CollectOptions) error {
+func ExecuteCollect(collectOptions *common.CollectOptions) error {
//verification parameters
err := VerificationParameters(collectOptions)
if err != nil {
@@ -138,7 +138,7 @@ func ExecuteCollect(collectOptions *types.CollectOptions) error {
}
// verification parameters for debug collect
-func VerificationParameters(collectOptions *types.CollectOptions) error {
+func VerificationParameters(collectOptions *common.CollectOptions) error {
if !util.FileExists(collectOptions.Config) {
return fmt.Errorf("edgecore config %s does not exist", collectOptions.Config)
}
@@ -200,7 +200,7 @@ func collectSystemData(tmpPath string) error {
}
// collect edgecore data
-func collectEdgecoreData(tmpPath string, config *v1alpha1.EdgeCoreConfig, ops *types.CollectOptions) error {
+func collectEdgecoreData(tmpPath string, config *v1alpha1.EdgeCoreConfig, ops *common.CollectOptions) error {
printDetail(fmt.Sprintf("create tmp file: %s", tmpPath))
err := os.Mkdir(tmpPath, os.ModePerm)
if err != nil {
diff --git a/keadm/cmd/keadm/app/cmd/debug/diagnose.go b/keadm/cmd/keadm/app/cmd/debug/diagnose.go
index 685df8ed2..1ead441e7 100644
--- a/keadm/cmd/keadm/app/cmd/debug/diagnose.go
+++ b/keadm/cmd/keadm/app/cmd/debug/diagnose.go
@@ -5,16 +5,14 @@ import (
"fmt"
"io"
- kubeedgeTypes "github.com/kubeedge/kubeedge/common/types"
+ "github.com/spf13/cobra"
+ v1 "k8s.io/api/core/v1"
+
+ "github.com/kubeedge/kubeedge/common/types"
"github.com/kubeedge/kubeedge/edge/pkg/metamanager/dao"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- constant "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
"github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1"
- edgecoreCfg "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1"
- "github.com/spf13/cobra"
- v1 "k8s.io/api/core/v1"
)
var (
@@ -37,17 +35,17 @@ keadm debug diagnose install -i 192.168.1.2
`
)
-type Diagnose types.DiagnoseObject
+type Diagnose common.DiagnoseObject
// NewDiagnose returns KubeEdge edge debug Diagnose command.
-func NewDiagnose(out io.Writer, diagnoseOptions *types.DiagnoseOptions) *cobra.Command {
+func NewDiagnose(out io.Writer, diagnoseOptions *common.DiagnoseOptions) *cobra.Command {
cmd := &cobra.Command{
Use: "diagnose",
Short: edgeDiagnoseShortDescription,
Long: edgeDiagnoseLongDescription,
Example: edgeDiagnoseExample,
}
- for _, v := range constant.DiagnoseObjectMap {
+ for _, v := range common.DiagnoseObjectMap {
cmd.AddCommand(NewSubDiagnose(out, Diagnose(v)))
}
return cmd
@@ -63,12 +61,12 @@ func NewSubDiagnose(out io.Writer, object Diagnose) *cobra.Command {
},
}
switch object.Use {
- case constant.ArgDiagnoseNode:
- cmd.Flags().StringVarP(&do.Config, constant.EdgecoreConfig, "c", do.Config,
+ case common.ArgDiagnoseNode:
+ cmd.Flags().StringVarP(&do.Config, common.EdgecoreConfig, "c", do.Config,
fmt.Sprintf("Specify configuration file, defalut is %s", common.EdgecoreConfigPath))
- case constant.ArgDiagnosePod:
+ case common.ArgDiagnosePod:
cmd.Flags().StringVarP(&do.Namespace, "namespace", "n", do.Namespace, "specify namespace")
- case constant.ArgDiagnoseInstall:
+ case common.ArgDiagnoseInstall:
cmd.Flags().StringVarP(&do.CheckOptions.DNSIP, "dns-ip", "D", do.CheckOptions.DNSIP, "specify test dns server ip")
cmd.Flags().StringVarP(&do.CheckOptions.Domain, "domain", "d", do.CheckOptions.Domain, "specify test domain")
cmd.Flags().StringVarP(&do.CheckOptions.IP, "ip", "i", do.CheckOptions.IP, "specify test ip")
@@ -79,24 +77,24 @@ func NewSubDiagnose(out io.Writer, object Diagnose) *cobra.Command {
}
// Add flags
-func NewDiagnoseOptins() *types.DiagnoseOptions {
- do := &types.DiagnoseOptions{}
+func NewDiagnoseOptins() *common.DiagnoseOptions {
+ do := &common.DiagnoseOptions{}
do.Namespace = "default"
- do.Config = types.EdgecoreConfigPath
- do.CheckOptions = &types.CheckOptions{
+ do.Config = common.EdgecoreConfigPath
+ do.CheckOptions = &common.CheckOptions{
IP: "",
Timeout: 3,
- Runtime: types.DefaultRuntime,
+ Runtime: common.DefaultRuntime,
}
return do
}
-func (da Diagnose) ExecuteDiagnose(use string, ops *types.DiagnoseOptions, args []string) {
+func (da Diagnose) ExecuteDiagnose(use string, ops *common.DiagnoseOptions, args []string) {
err := fmt.Errorf("")
switch use {
- case constant.ArgDiagnoseNode:
+ case common.ArgDiagnoseNode:
err = DiagnoseNode(ops)
- case constant.ArgDiagnosePod:
+ case common.ArgDiagnosePod:
if len(args) == 0 {
fmt.Println("error: You must specify a pod name")
return
@@ -106,19 +104,19 @@ func (da Diagnose) ExecuteDiagnose(use string, ops *types.DiagnoseOptions, args
if err == nil {
err = DiagnosePod(ops, args[0])
}
- case constant.ArgDiagnoseInstall:
+ case common.ArgDiagnoseInstall:
err = DiagnoseInstall(ops.CheckOptions)
}
if err != nil {
fmt.Println(err.Error())
- util.PrintFail(use, constant.StrDiagnose)
+ util.PrintFail(use, common.StrDiagnose)
} else {
- util.PrintSuccedd(use, constant.StrDiagnose)
+ util.PrintSuccedd(use, common.StrDiagnose)
}
}
-func DiagnoseNode(ops *types.DiagnoseOptions) error {
+func DiagnoseNode(ops *common.DiagnoseOptions) error {
osType := util.GetOSInterface()
isEdgeRuning, err := osType.IsKubeEdgeProcessRunning(util.KubeEdgeBinaryName)
if err != nil {
@@ -173,16 +171,16 @@ func DiagnoseNode(ops *types.DiagnoseOptions) error {
return nil
}
-func DiagnosePod(ops *types.DiagnoseOptions, podName string) error {
+func DiagnosePod(ops *common.DiagnoseOptions, podName string) error {
ready := false
if ops.DBPath == "" {
- ops.DBPath = edgecoreCfg.DataBaseDataSource
+ ops.DBPath = v1alpha1.DataBaseDataSource
}
- err := InitDB(edgecoreCfg.DataBaseDriverName, edgecoreCfg.DataBaseAliasName, ops.DBPath)
+ err := InitDB(v1alpha1.DataBaseDriverName, v1alpha1.DataBaseAliasName, ops.DBPath)
if err != nil {
return fmt.Errorf("Failed to initialize database: %v ", err)
}
- fmt.Printf("Database %s is exist \n", edgecoreCfg.DataBaseDataSource)
+ fmt.Printf("Database %s is exist \n", v1alpha1.DataBaseDataSource)
podStatus, err := QueryPodFromDatabase(ops.Namespace, podName)
if err != nil {
return err
@@ -264,7 +262,7 @@ func QueryPodFromDatabase(resNamePaces string, podName string) (*v1.PodStatus, e
fmt.Printf("PodStatus %s is exist \n", podName)
r := *resultStatus
- podStatus := &kubeedgeTypes.PodStatusRequest{}
+ podStatus := &types.PodStatusRequest{}
err = json.Unmarshal([]byte(r[0]), podStatus)
if err != nil {
return &podStatus.Status, err
@@ -272,7 +270,7 @@ func QueryPodFromDatabase(resNamePaces string, podName string) (*v1.PodStatus, e
return &podStatus.Status, nil
}
-func DiagnoseInstall(ob *types.CheckOptions) error {
+func DiagnoseInstall(ob *common.CheckOptions) error {
err := CheckCPU()
if err != nil {
return err
diff --git a/keadm/cmd/keadm/app/cmd/debug/get.go b/keadm/cmd/keadm/app/cmd/debug/get.go
index 445122b3d..0b40a54a2 100644
--- a/keadm/cmd/keadm/app/cmd/debug/get.go
+++ b/keadm/cmd/keadm/app/cmd/debug/get.go
@@ -18,7 +18,6 @@ import (
"encoding/json"
"fmt"
"io"
- "k8s.io/klog/v2"
"os"
"strings"
@@ -30,6 +29,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/cli-runtime/pkg/printers"
+ "k8s.io/klog/v2"
api "k8s.io/kubernetes/pkg/apis/core"
k8sprinters "k8s.io/kubernetes/pkg/printers"
printersinternal "k8s.io/kubernetes/pkg/printers/internalversion"
diff --git a/keadm/cmd/keadm/app/cmd/reset.go b/keadm/cmd/keadm/app/cmd/reset.go
index 095db87bb..ce1abcc22 100644
--- a/keadm/cmd/keadm/app/cmd/reset.go
+++ b/keadm/cmd/keadm/app/cmd/reset.go
@@ -30,7 +30,6 @@ import (
utilsexec "k8s.io/utils/exec"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
- types "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common"
"github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util"
)
@@ -56,7 +55,7 @@ func newResetOptions() *common.ResetOptions {
}
// NewKubeEdgeReset represents the reset command
-func NewKubeEdgeReset(out io.Writer, reset *types.ResetOptions) *cobra.Command {
+func NewKubeEdgeReset(out io.Writer, reset *common.ResetOptions) *cobra.Command {
IsEdgeNode := false
if reset == nil {
reset = newResetOptions()
@@ -73,9 +72,9 @@ func NewKubeEdgeReset(out io.Writer, reset *types.ResetOptions) *cobra.Command {
return err
}
switch whoRunning {
- case types.KubeEdgeEdgeRunning:
+ case common.KubeEdgeEdgeRunning:
IsEdgeNode = true
- case types.NoneRunning:
+ case common.NoneRunning:
return fmt.Errorf("None of KubeEdge components are running in this host")
}
return nil
@@ -122,7 +121,7 @@ func NewKubeEdgeReset(out io.Writer, reset *types.ResetOptions) *cobra.Command {
// TearDownKubeEdge will bring down either cloud or edge components,
// depending upon in which type of node it is executed
func TearDownKubeEdge(isEdgeNode bool, kubeConfig string) error {
- var ke types.ToolsInstaller
+ var ke common.ToolsInstaller
ke = &util.KubeCloudInstTool{Common: util.Common{KubeConfig: kubeConfig}}
if isEdgeNode {
ke = &util.KubeEdgeInstTool{Common: util.Common{}}
@@ -175,7 +174,7 @@ func cleanDirectories(isEdgeNode bool) error {
return nil
}
-func addResetFlags(cmd *cobra.Command, resetOpts *types.ResetOptions) {
+func addResetFlags(cmd *cobra.Command, resetOpts *common.ResetOptions) {
cmd.Flags().StringVar(&resetOpts.Kubeconfig, common.KubeConfig, resetOpts.Kubeconfig,
"Use this key to set kube-config path, eg: $HOME/.kube/config")
cmd.Flags().BoolVar(&resetOpts.Force, "force", resetOpts.Force,
diff --git a/mappers/bluetooth_mapper/action_manager/action_manager.go b/mappers/bluetooth_mapper/action_manager/action_manager.go
index 5513ae21c..ea739bc9d 100644
--- a/mappers/bluetooth_mapper/action_manager/action_manager.go
+++ b/mappers/bluetooth_mapper/action_manager/action_manager.go
@@ -24,7 +24,7 @@ import (
"github.com/paypal/gatt"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
)
const (
diff --git a/mappers/bluetooth_mapper/configuration/config.go b/mappers/bluetooth_mapper/configuration/config.go
index c23178c36..fb032e491 100644
--- a/mappers/bluetooth_mapper/configuration/config.go
+++ b/mappers/bluetooth_mapper/configuration/config.go
@@ -25,8 +25,8 @@ import (
"gopkg.in/yaml.v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher"
)
diff --git a/mappers/bluetooth_mapper/controller/controller.go b/mappers/bluetooth_mapper/controller/controller.go
index d75a31faf..56504ca88 100644
--- a/mappers/bluetooth_mapper/controller/controller.go
+++ b/mappers/bluetooth_mapper/controller/controller.go
@@ -25,9 +25,9 @@ import (
"github.com/paypal/gatt/examples/option"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher"
diff --git a/mappers/bluetooth_mapper/watcher/watcher.go b/mappers/bluetooth_mapper/watcher/watcher.go
index 668ccf7bd..b7db3c000 100644
--- a/mappers/bluetooth_mapper/watcher/watcher.go
+++ b/mappers/bluetooth_mapper/watcher/watcher.go
@@ -26,8 +26,8 @@ import (
"github.com/paypal/gatt"
"k8s.io/klog/v2"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
- "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
+ actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
+ dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper"
)
diff --git a/mappers/common/event_test.go b/mappers/common/event_test.go
deleted file mode 100644
index 794f7a544..000000000
--- a/mappers/common/event_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright 2020 The KubeEdge Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mappercommon
-
-import (
- "fmt"
- "os"
- "time"
-
- mqtt "github.com/eclipse/paho.mqtt.golang"
-)
-
-func onMessage(client mqtt.Client, message mqtt.Message) {
- fmt.Println("Get topic", message.Topic())
-}
-
-func main() {
- var c MqttClient = MqttClient{IP: "tcp://127.0.0.1:1883"}
- err := c.Connect()
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- } else {
- fmt.Println("Connect mqtt server success", c.IP)
- }
- err = c.Subscribe("$hw/events/device/#", onMessage)
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- } else {
- fmt.Println("Subscribe topic success")
- }
- err = c.Publish("$hw/events/device/001/data/update", "test")
- if err != nil {
- fmt.Println(err)
- os.Exit(1)
- }
- for {
- time.Sleep(time.Second)
- }
-}
diff --git a/mappers/modbus-go/configmap/parse.go b/mappers/modbus-go/configmap/parse.go
index 4a63342f2..c84b0faf5 100644
--- a/mappers/modbus-go/configmap/parse.go
+++ b/mappers/modbus-go/configmap/parse.go
@@ -21,9 +21,10 @@ import (
"errors"
"io/ioutil"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// Parse parse the configmap.
diff --git a/mappers/modbus-go/configmap/parse_test.go b/mappers/modbus-go/configmap/parse_test.go
index a49521886..0c0afae7b 100644
--- a/mappers/modbus-go/configmap/parse_test.go
+++ b/mappers/modbus-go/configmap/parse_test.go
@@ -4,9 +4,10 @@ import (
"encoding/json"
"testing"
+ "github.com/stretchr/testify/assert"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
. "github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "github.com/stretchr/testify/assert"
)
func TestParse(t *testing.T) {
diff --git a/mappers/modbus-go/device/device.go b/mappers/modbus-go/device/device.go
index bd812db67..b7516caa2 100644
--- a/mappers/modbus-go/device/device.go
+++ b/mappers/modbus-go/device/device.go
@@ -26,12 +26,12 @@ import (
"time"
mqtt "github.com/eclipse/paho.mqtt.golang"
- mappercommon "github.com/kubeedge/kubeedge/mappers/common"
+ "k8s.io/klog/v2"
+ mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/configmap"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
var devices map[string]*globals.ModbusDev
diff --git a/mappers/modbus-go/device/devstatus.go b/mappers/modbus-go/device/devstatus.go
index bf762f8ae..d6dda5703 100644
--- a/mappers/modbus-go/device/devstatus.go
+++ b/mappers/modbus-go/device/devstatus.go
@@ -17,10 +17,11 @@ limitations under the License.
package device
import (
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// GetStatus is the timer structure for getting device status.
diff --git a/mappers/modbus-go/device/twindata.go b/mappers/modbus-go/device/twindata.go
index 6aedcec46..db964b164 100644
--- a/mappers/modbus-go/device/twindata.go
+++ b/mappers/modbus-go/device/twindata.go
@@ -20,10 +20,11 @@ import (
"strconv"
"strings"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/driver"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
// TwinData is the timer structure for getting twin/data.
diff --git a/mappers/modbus-go/main.go b/mappers/modbus-go/main.go
index 74bafd840..ff6e84fc2 100644
--- a/mappers/modbus-go/main.go
+++ b/mappers/modbus-go/main.go
@@ -19,10 +19,11 @@ package main
import (
"os"
+ "k8s.io/klog/v2"
+
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/device"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog/v2"
)
func main() {
diff --git a/tests/e2e/utils/node.go b/tests/e2e/utils/node.go
index 18a6bfaaa..011ce467b 100644
--- a/tests/e2e/utils/node.go
+++ b/tests/e2e/utils/node.go
@@ -30,7 +30,7 @@ import (
"github.com/ghodss/yaml"
"github.com/onsi/gomega"
- "k8s.io/api/core/v1"
+ v1 "k8s.io/api/core/v1"
)
func getpwd() string {
diff --git a/tests/performance/loadtest/loadtest_test.go b/tests/performance/loadtest/loadtest_test.go
index 1c8d6571b..8d285a81b 100644
--- a/tests/performance/loadtest/loadtest_test.go
+++ b/tests/performance/loadtest/loadtest_test.go
@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "k8s.io/api/apps/v1"
+ v1 "k8s.io/api/apps/v1"
metav1 "k8s.io/api/core/v1"
"github.com/kubeedge/kubeedge/tests/e2e/utils"