diff options
| author | Rio Zhu <32083634+zzxgzgz@users.noreply.github.com> | 2020-11-01 22:03:45 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-01 22:03:45 -0800 |
| commit | 9d9a5fa6201157da7ef633a02699b3357d5fda22 (patch) | |
| tree | ff9ca4b636235a1a2f3055c88b3bcef569d6bcc4 | |
| parent | Moved logManager and runtimeClassManager to start at the Start() function. Fi... (diff) | |
| download | kubeedge-9d9a5fa6201157da7ef633a02699b3357d5fda22.tar.gz | |
Sorted imports, deleted extra file (#12)
* Moved logManager and runtimeClassManager to start at the Start() function. Fixed typo
* Sorted imports
* Delete extra file
| -rw-r--r-- | edge/pkg/edged/edged.go | 7 | ||||
| -rw-r--r-- | edge/pkg/edged/edged_pods.go | 17 | ||||
| -rw-r--r-- | tests/e2e/config.json | 8 |
3 files changed, 13 insertions, 19 deletions
diff --git a/edge/pkg/edged/edged.go b/edge/pkg/edged/edged.go index aabfc0243..e9338a176 100644 --- a/edge/pkg/edged/edged.go +++ b/edge/pkg/edged/edged.go @@ -27,9 +27,6 @@ import ( "bytes" "encoding/json" "fmt" - cadvisorapi2 "github.com/google/cadvisor/info/v2" - "k8s.io/kubernetes/pkg/kubelet/logs" - "k8s.io/kubernetes/pkg/kubelet/runtimeclass" "net" "net/http" "os" @@ -37,6 +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" diff --git a/edge/pkg/edged/edged_pods.go b/edge/pkg/edged/edged_pods.go index ccca73cd6..8a887f4a4 100644 --- a/edge/pkg/edged/edged_pods.go +++ b/edge/pkg/edged/edged_pods.go @@ -33,6 +33,15 @@ import ( "fmt" "io" "io/ioutil" + "net/http" + "net/url" + "os" + "path" + "path/filepath" + "runtime" + "sort" + "strings" + v1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -57,14 +66,6 @@ import ( "k8s.io/kubernetes/pkg/volume/validation" "k8s.io/kubernetes/third_party/forked/golang/expansion" utilfile "k8s.io/utils/path" - "net/http" - "net/url" - "os" - "path" - "path/filepath" - "runtime" - "sort" - "strings" edgedconfig "github.com/kubeedge/kubeedge/edge/pkg/edged/config" pkgutil "github.com/kubeedge/kubeedge/pkg/util" diff --git a/tests/e2e/config.json b/tests/e2e/config.json deleted file mode 100644 index bc227072d..000000000 --- a/tests/e2e/config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "image_url": ["nginx", "nginx"], - "k8smasterforkubeedge":"https://172.17.0.2:6443", - "dockerhubusername":"user", - "dockerhubpassword":"password", - "mqttendpoint":"tcp://127.0.0.1:1884", - "kubeconfigpath":"/home/ubuntu/.kube/config" -} |