diff options
| author | wbc6080 <wangbincheng4@huawei.com> | 2024-01-19 14:19:32 +0800 |
|---|---|---|
| committer | wbc6080 <wangbincheng4@huawei.com> | 2024-01-22 14:50:33 +0800 |
| commit | 173530048883b186b4e0536232ca9255883731bd (patch) | |
| tree | 37d39b09cfcced77b234fc0dfc3c5ad512c7ef38 | |
| parent | Merge pull request #5370 from tangming1996/feature/edgeapplications (diff) | |
| download | kubeedge-173530048883b186b4e0536232ca9255883731bd.tar.gz | |
fix the package version in mapper-framework
Signed-off-by: wbc6080 <wangbincheng4@huawei.com>
3 files changed, 11 insertions, 8 deletions
diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go index 692806843..45f650a3a 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/device/device.go @@ -251,7 +251,7 @@ func (d *DevPanel) DevInit(deviceList []*dmiapi.Device, deviceModelList []*dmiap for i := range deviceModelList { model := deviceModelList[i] - cur := parse.ParseDeviceModelFromGrpc(model) + cur := parse.GetDeviceModelFromGrpc(model) d.models[model.Name] = cur } @@ -262,7 +262,7 @@ func (d *DevPanel) DevInit(deviceList []*dmiapi.Device, deviceModelList []*dmiap if err != nil { return err } - instance, err := parse.ParseDeviceFromGrpc(device, &commonModel) + instance, err := parse.GetDeviceFromGrpc(device, &commonModel) if err != nil { return err } diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod index 04d50d22c..69e3d6025 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.mod @@ -8,8 +8,8 @@ require ( github.com/golang/protobuf v1.5.3 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/influxdata/influxdb-client-go/v2 v2.13.0 - github.com/kubeedge/kubeedge v1.15.0-beta.0.0.20240110111122-c44efa2389b9 - github.com/kubeedge/mapper-framework v0.0.0-20240111132845-9ad4739bda66 + github.com/kubeedge/kubeedge v1.16.0-beta.0 + github.com/kubeedge/mapper-framework v0.0.0-20240119021034-e7755b2f421c github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect github.com/taosdata/driver-go/v3 v3.5.1 golang.org/x/net v0.17.0 // indirect @@ -21,6 +21,7 @@ require ( require ( github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect + github.com/avast/retry-go v3.0.0+incompatible // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/go-logr/logr v1.2.4 // indirect diff --git a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.sum b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.sum index ddd9dcd94..23d3b42fd 100644 --- a/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.sum +++ b/staging/src/github.com/kubeedge/mapper-framework/_template/mapper/go.sum @@ -1,6 +1,8 @@ github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ= github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= +github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0= +github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -41,10 +43,10 @@ github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kubeedge/kubeedge v1.15.0-beta.0.0.20240110111122-c44efa2389b9 h1:vVjy6eJGzKZyAdW2L2E8fi2DDz4w4Bn+1pwXgC/v2W8= -github.com/kubeedge/kubeedge v1.15.0-beta.0.0.20240110111122-c44efa2389b9/go.mod h1:3f9VoRV6ar6yAOrjRYySlYBoSG3n4BEi/PitT2uoUm4= -github.com/kubeedge/mapper-framework v0.0.0-20240111132845-9ad4739bda66 h1:940QrCzf+VzhN0DLN2yqJTrhp/i3X8Gs1UoNe481y2Q= -github.com/kubeedge/mapper-framework v0.0.0-20240111132845-9ad4739bda66/go.mod h1:rmqQW2sG+pD54PxpTWiV4Xl9EH60kPghkKhPJygxcPM= +github.com/kubeedge/kubeedge v1.16.0-beta.0 h1:wMImL1r1PqwBCLCrZlEHJ83o+h4u2yFOABktHFDeDyQ= +github.com/kubeedge/kubeedge v1.16.0-beta.0/go.mod h1:NbL/UWB68wuY5itB/0jMtDyI04Q+Iw2CJshOQz/WJS4= +github.com/kubeedge/mapper-framework v0.0.0-20240119021034-e7755b2f421c h1:MgUJkEWzYl29dLDDLPshKEoUwqmJexCJlJTbLQQWneM= +github.com/kubeedge/mapper-framework v0.0.0-20240119021034-e7755b2f421c/go.mod h1:at9JLS7mVPMBAvzlRMfn2E4p4ReoVv9/yQ2oYU86t00= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= |