Skip to content

Commit 57b897c

Browse files
authored
Merge pull request kubeedge#75 from jsparter/pheacky
fix/mapper: make Parse recognize customizedProtocol correctly
2 parents 34b73a4 + 7a270f3 commit 57b897c

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

_template/mapper/configmap/parse.go

+15-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ import (
2323

2424
"k8s.io/klog/v2"
2525

26-
"github.com/kubeedge/mappers-go/mappers/common"
2726
"github.com/kubeedge/mappers-go/mappers/Template/globals"
27+
"github.com/kubeedge/mappers-go/mappers/common"
2828
)
2929

3030
// Parse parse the configmap.
@@ -57,8 +57,21 @@ func Parse(path string,
5757
return err
5858
}
5959

60-
if instance.PProtocol.Protocol != "Template" {
60+
if instance.PProtocol.Protocol != "customized-protocol" {
6161
continue
62+
} else {
63+
cprotocol := struct {
64+
ProtocolName string `json:"protocolName"`
65+
ConfigData json.RawMessage
66+
}{}
67+
err = json.Unmarshal(instance.PProtocol.ProtocolConfigs, &cprotocol)
68+
if err != nil {
69+
klog.Error("customized-protocol unmarshal error:", err)
70+
continue
71+
}
72+
if cprotocol.ProtocolName != "Template" {
73+
continue
74+
}
6275
}
6376

6477
for k := 0; k < len(instance.PropertyVisitors); k++ {

0 commit comments

Comments
 (0)