summaryrefslogtreecommitdiff
path: root/mappers
diff options
context:
space:
mode:
authorKubeEdge Bot <48982446+kubeedge-bot@users.noreply.github.com>2020-11-23 09:43:34 +0800
committerGitHub <noreply@github.com>2020-11-23 09:43:34 +0800
commit0e0c11598b77904132ca33a6dbd93295c4c0dc1f (patch)
tree9300ae11236416326c8f5d093819b054e875f92d /mappers
parentMerge pull request #2354 from zhijianli88/cleanup-tempfiles (diff)
parentfix license (diff)
downloadkubeedge-0e0c11598b77904132ca33a6dbd93295c4c0dc1f.tar.gz
Merge pull request #2349 from GsssC/fixKlog
upgrade klog@0.4.0 to klog/v2@2.2.0
Diffstat (limited to 'mappers')
-rw-r--r--mappers/bluetooth_mapper/action_manager/action_manager.go2
-rw-r--r--mappers/bluetooth_mapper/controller/controller.go2
-rw-r--r--mappers/bluetooth_mapper/helper/helper.go2
-rw-r--r--mappers/bluetooth_mapper/main.go2
-rw-r--r--mappers/bluetooth_mapper/scheduler/scheduler.go2
-rw-r--r--mappers/bluetooth_mapper/watcher/watcher.go2
-rw-r--r--mappers/modbus-go/config.go2
-rw-r--r--mappers/modbus-go/configmap/parse.go2
-rw-r--r--mappers/modbus-go/device/device.go2
-rw-r--r--mappers/modbus-go/device/devstatus.go2
-rw-r--r--mappers/modbus-go/device/twindata.go2
-rw-r--r--mappers/modbus-go/driver/client.go2
-rw-r--r--mappers/modbus-go/main.go2
13 files changed, 13 insertions, 13 deletions
diff --git a/mappers/bluetooth_mapper/action_manager/action_manager.go b/mappers/bluetooth_mapper/action_manager/action_manager.go
index 843481c1e..5513ae21c 100644
--- a/mappers/bluetooth_mapper/action_manager/action_manager.go
+++ b/mappers/bluetooth_mapper/action_manager/action_manager.go
@@ -22,7 +22,7 @@ import (
"strings"
"github.com/paypal/gatt"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
)
diff --git a/mappers/bluetooth_mapper/controller/controller.go b/mappers/bluetooth_mapper/controller/controller.go
index d3389fe6e..d75a31faf 100644
--- a/mappers/bluetooth_mapper/controller/controller.go
+++ b/mappers/bluetooth_mapper/controller/controller.go
@@ -23,7 +23,7 @@ import (
MQTT "github.com/eclipse/paho.mqtt.golang"
"github.com/paypal/gatt"
"github.com/paypal/gatt/examples/option"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration"
diff --git a/mappers/bluetooth_mapper/helper/helper.go b/mappers/bluetooth_mapper/helper/helper.go
index cbcf494c6..8ce782778 100644
--- a/mappers/bluetooth_mapper/helper/helper.go
+++ b/mappers/bluetooth_mapper/helper/helper.go
@@ -23,7 +23,7 @@ import (
"time"
MQTT "github.com/eclipse/paho.mqtt.golang"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
)
var (
diff --git a/mappers/bluetooth_mapper/main.go b/mappers/bluetooth_mapper/main.go
index 2f7883119..c1e58c2f4 100644
--- a/mappers/bluetooth_mapper/main.go
+++ b/mappers/bluetooth_mapper/main.go
@@ -21,7 +21,7 @@ import (
"os"
"github.com/spf13/pflag"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/controller"
diff --git a/mappers/bluetooth_mapper/scheduler/scheduler.go b/mappers/bluetooth_mapper/scheduler/scheduler.go
index 0ec9cf79d..bdfcaf1ee 100644
--- a/mappers/bluetooth_mapper/scheduler/scheduler.go
+++ b/mappers/bluetooth_mapper/scheduler/scheduler.go
@@ -22,7 +22,7 @@ import (
"strings"
"time"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
actionmanager "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
dataconverter "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
diff --git a/mappers/bluetooth_mapper/watcher/watcher.go b/mappers/bluetooth_mapper/watcher/watcher.go
index 36f350ee1..668ccf7bd 100644
--- a/mappers/bluetooth_mapper/watcher/watcher.go
+++ b/mappers/bluetooth_mapper/watcher/watcher.go
@@ -24,7 +24,7 @@ import (
"time"
"github.com/paypal/gatt"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager"
"github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter"
diff --git a/mappers/modbus-go/config.go b/mappers/modbus-go/config.go
index 89474504d..21ec1f0bf 100644
--- a/mappers/modbus-go/config.go
+++ b/mappers/modbus-go/config.go
@@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
"gopkg.in/yaml.v2"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
)
// Config is the modbus mapper configuration.
diff --git a/mappers/modbus-go/configmap/parse.go b/mappers/modbus-go/configmap/parse.go
index 41ae84ac0..4a63342f2 100644
--- a/mappers/modbus-go/configmap/parse.go
+++ b/mappers/modbus-go/configmap/parse.go
@@ -23,7 +23,7 @@ import (
mappercommon "github.com/kubeedge/kubeedge/mappers/common"
"github.com/kubeedge/kubeedge/mappers/modbus-go/globals"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
)
// Parse parse the configmap.
diff --git a/mappers/modbus-go/device/device.go b/mappers/modbus-go/device/device.go
index d03097a78..bd812db67 100644
--- a/mappers/modbus-go/device/device.go
+++ b/mappers/modbus-go/device/device.go
@@ -31,7 +31,7 @@ import (
"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"
+ "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 f4b90dab4..bf762f8ae 100644
--- a/mappers/modbus-go/device/devstatus.go
+++ b/mappers/modbus-go/device/devstatus.go
@@ -20,7 +20,7 @@ import (
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"
+ "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 798516d4a..6aedcec46 100644
--- a/mappers/modbus-go/device/twindata.go
+++ b/mappers/modbus-go/device/twindata.go
@@ -23,7 +23,7 @@ import (
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"
+ "k8s.io/klog/v2"
)
// TwinData is the timer structure for getting twin/data.
diff --git a/mappers/modbus-go/driver/client.go b/mappers/modbus-go/driver/client.go
index 49fdfa0c6..07a04a172 100644
--- a/mappers/modbus-go/driver/client.go
+++ b/mappers/modbus-go/driver/client.go
@@ -22,7 +22,7 @@ import (
"time"
"github.com/sailorvii/modbus"
- "k8s.io/klog"
+ "k8s.io/klog/v2"
)
// ModbusTCP is the configurations of modbus TCP.
diff --git a/mappers/modbus-go/main.go b/mappers/modbus-go/main.go
index e6cef42e8..74bafd840 100644
--- a/mappers/modbus-go/main.go
+++ b/mappers/modbus-go/main.go
@@ -22,7 +22,7 @@ import (
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"
+ "k8s.io/klog/v2"
)
func main() {