summaryrefslogtreecommitdiff
path: root/edge
diff options
context:
space:
mode:
Diffstat (limited to 'edge')
-rw-r--r--edge/cmd/edgecore/app/server.go4
-rw-r--r--edge/pkg/devicetwin/dtmanager/membership.go2
-rw-r--r--edge/pkg/devicetwin/process.go8
-rw-r--r--edge/pkg/edged/edged_status.go2
-rw-r--r--edge/pkg/edged/status/status_manager.go6
-rw-r--r--edge/pkg/edged/volume/csi/csi_mounter.go2
-rw-r--r--edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go2
-rwxr-xr-xedge/test/integration/utils/common/log.go2
-rw-r--r--edge/test/integration/utils/helpers/helpers.go6
-rw-r--r--edge/test/test.go2
10 files changed, 15 insertions, 21 deletions
diff --git a/edge/cmd/edgecore/app/server.go b/edge/cmd/edgecore/app/server.go
index 8c105779a..b1810989d 100644
--- a/edge/cmd/edgecore/app/server.go
+++ b/edge/cmd/edgecore/app/server.go
@@ -131,14 +131,14 @@ func environmentCheck() error {
// if kubelet is running, return error
if find, err := findProcess("kubelet"); err != nil {
return err
- } else if find == true {
+ } else if find {
return errors.New("Kubelet should not running on edge node when running edgecore")
}
// if kube-proxy is running, return error
if find, err := findProcess("kube-proxy"); err != nil {
return err
- } else if find == true {
+ } else if find {
return errors.New("Kube-proxy should not running on edge node when running edgecore")
}
diff --git a/edge/pkg/devicetwin/dtmanager/membership.go b/edge/pkg/devicetwin/dtmanager/membership.go
index dc9ce3788..483001c0d 100644
--- a/edge/pkg/devicetwin/dtmanager/membership.go
+++ b/edge/pkg/devicetwin/dtmanager/membership.go
@@ -167,7 +167,7 @@ func Added(context *dtcontext.DTContext, toAdd []dttype.Device, baseMessage dtty
if !delta {
baseMessage.EventID = ""
}
- if toAdd == nil || len(toAdd) == 0 {
+ if len(toAdd) == 0 {
return
}
dealType := 0
diff --git a/edge/pkg/devicetwin/process.go b/edge/pkg/devicetwin/process.go
index 57ce1845c..07b2ac30b 100644
--- a/edge/pkg/devicetwin/process.go
+++ b/edge/pkg/devicetwin/process.go
@@ -157,9 +157,7 @@ func SyncDeviceFromSqlite(context *dtcontext.DTContext, deviceID string) error {
return err
}
attributes := make([]dtclient.DeviceAttr, 0)
- for _, attr := range *deviceAttr {
- attributes = append(attributes, attr)
- }
+ attributes = append(attributes, *deviceAttr...)
deviceTwin, err := dtclient.QueryDeviceTwin("deviceid", deviceID)
if err != nil {
@@ -167,9 +165,7 @@ func SyncDeviceFromSqlite(context *dtcontext.DTContext, deviceID string) error {
return err
}
twins := make([]dtclient.DeviceTwin, 0)
- for _, twin := range *deviceTwin {
- twins = append(twins, twin)
- }
+ twins = append(twins, *deviceTwin...)
context.DeviceList.Store(deviceID, &dttype.Device{
ID: deviceID,
diff --git a/edge/pkg/edged/edged_status.go b/edge/pkg/edged/edged_status.go
index cf7d50132..0aa72a48f 100644
--- a/edge/pkg/edged/edged_status.go
+++ b/edge/pkg/edged/edged_status.go
@@ -380,7 +380,7 @@ func (e *edged) registerNode() error {
e.setInitNode(node)
- if config.Config.RegisterNode == false {
+ if !config.Config.RegisterNode {
//when register-node set to false, do not auto register node
klog.Infof("register-node is set to false")
e.registrationCompleted = true
diff --git a/edge/pkg/edged/status/status_manager.go b/edge/pkg/edged/status/status_manager.go
index 64daf796d..a5ff9154a 100644
--- a/edge/pkg/edged/status/status_manager.go
+++ b/edge/pkg/edged/status/status_manager.go
@@ -54,10 +54,8 @@ func (m *manager) Start() {
syncTicker := time.Tick(syncPeriod)
go wait.Forever(func() {
- select {
- case <-syncTicker:
- m.updatePodStatus()
- }
+ <-syncTicker
+ m.updatePodStatus()
}, 0)
}
diff --git a/edge/pkg/edged/volume/csi/csi_mounter.go b/edge/pkg/edged/volume/csi/csi_mounter.go
index 527375222..70e07af69 100644
--- a/edge/pkg/edged/volume/csi/csi_mounter.go
+++ b/edge/pkg/edged/volume/csi/csi_mounter.go
@@ -308,7 +308,7 @@ func (c *csiMountMgr) podAttributes() (map[string]string, error) {
}
// if PodInfoOnMount is not set or false we do not set pod attributes
- if csiDriver.Spec.PodInfoOnMount == nil || *csiDriver.Spec.PodInfoOnMount == false {
+ if csiDriver.Spec.PodInfoOnMount == nil || !*csiDriver.Spec.PodInfoOnMount {
klog.V(4).Infof(log("CSIDriver %q does not require pod information", c.driverName))
return nil, nil
}
diff --git a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
index 6755dd2ac..1c7a736d3 100644
--- a/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
+++ b/edge/pkg/edged/volume/csi/nodeinfomanager/nodeinfomanager.go
@@ -324,7 +324,7 @@ func removeNodeIDFromNode(csiDriverName string) nodeUpdateFunc {
// topology information.
func updateTopologyLabels(topology map[string]string) nodeUpdateFunc {
return func(node *v1.Node) (*v1.Node, bool, error) {
- if topology == nil || len(topology) == 0 {
+ if len(topology) == 0 {
return node, false, nil
}
diff --git a/edge/test/integration/utils/common/log.go b/edge/test/integration/utils/common/log.go
index 5a93357e7..d1267c07f 100755
--- a/edge/test/integration/utils/common/log.go
+++ b/edge/test/integration/utils/common/log.go
@@ -51,7 +51,7 @@ func PrintTestcaseNameandStatus() {
var testdesc ginkgo.GinkgoTestDescription
var Status string
testdesc = ginkgo.CurrentGinkgoTestDescription()
- if testdesc.Failed == true {
+ if testdesc.Failed {
Status = "FAILED"
} else {
Status = "PASSED"
diff --git a/edge/test/integration/utils/helpers/helpers.go b/edge/test/integration/utils/helpers/helpers.go
index daa47a442..f18c6f628 100644
--- a/edge/test/integration/utils/helpers/helpers.go
+++ b/edge/test/integration/utils/helpers/helpers.go
@@ -266,7 +266,7 @@ func HandleAddAndDeleteDevice(operation, testMgrEndPoint string, device dttype.D
common.Fatalf("HTTP request is failed :%v", err)
return false
}
- common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t))
+ common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t))
return true
}
@@ -309,7 +309,7 @@ func HandleAddAndDeletePods(operation string, edgedpoint string, UID string, con
common.Fatalf("HTTP request is failed :%v", err)
return false
}
- common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t))
+ common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t))
return true
}
@@ -330,7 +330,7 @@ func GetPods(EdgedEndpoint string) (v1.PodList, error) {
common.Fatalf("Sending HTTP request failed: %v", err)
return pods, nil
}
- common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t))
+ common.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t))
defer resp.Body.Close()
contents, err := ioutil.ReadAll(resp.Body)
if err != nil {
diff --git a/edge/test/test.go b/edge/test/test.go
index dfff3cb20..80c89fc89 100644
--- a/edge/test/test.go
+++ b/edge/test/test.go
@@ -65,7 +65,7 @@ func GetPodListFromEdged(w http.ResponseWriter) error {
klog.Errorf("Sending HTTP request failed: %v", err)
return err
}
- klog.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Now().Sub(t))
+ klog.Infof("%s %s %v in %v", req.Method, req.URL, resp.Status, time.Since(t))
defer resp.Body.Close()
contents, err := ioutil.ReadAll(resp.Body)
if err != nil {
generated by cgit v1.2.3 (git 2.52.0) at 2026-08-20 01:59:40 +0000