Merge pull request #3293 from Rachel-Shao/resTypev1.9.0-beta.0v1.9.0

Fix: resType does not match

2 files changed, 18 insertions, 5 deletions

diff --git a/cloud/pkg/dynamiccontroller/application/listener.go b/cloud/pkg/dynamiccontroller/application/listener.go
index 27b4f54df..e9c8a89dd 100644
--- a/cloud/pkg/dynamiccontroller/application/listener.go
+++ b/cloud/pkg/dynamiccontroller/application/listener.go
@@ -1,6 +1,8 @@
 package application
 
 import (
+	"strings"
+
 	"github.com/google/uuid"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -13,6 +15,7 @@ import (
 	"github.com/kubeedge/kubeedge/cloud/pkg/dynamiccontroller/messagelayer"
 	"github.com/kubeedge/kubeedge/cloud/pkg/edgecontroller/constants"
 	v2 "github.com/kubeedge/kubeedge/edge/pkg/metamanager/dao/v2"
+	"github.com/kubeedge/kubeedge/pkg/metaserver/util"
 )
 
 type SelectorListener struct {
@@ -54,7 +57,9 @@ func (l *SelectorListener) sendObj(event watch.Event, messageLayer messagelayer.
 	if namespace == "" {
 		namespace = v2.NullNamespace
 	}
-	resource, err := messagelayer.BuildResource(l.nodeName, namespace, l.gvr.Resource, accessor.GetName())
+	kind := util.UnsafeResourceToKind(l.gvr.Resource)
+	resourceType := strings.ToLower(kind)
+	resource, err := messagelayer.BuildResource(l.nodeName, namespace, resourceType, accessor.GetName())
 	if err != nil {
 		klog.Warningf("built message resource failed with error: %s", err)
 		return
diff --git a/pkg/metaserver/util/util.go b/pkg/metaserver/util/util.go
index 46d7622eb..42a0be5e9 100644
--- a/pkg/metaserver/util/util.go
+++ b/pkg/metaserver/util/util.go
@@ -50,9 +50,13 @@ func UnsafeResourceToKind(r string) string {
 		return r
 	}
 	unusualResourceToKind := map[string]string{
-		"endpoints": "Endpoints",
-		"nodes":     "Node",
-		"services":  "Service",
+		"endpoints":                    "Endpoints",
+		"nodes":                        "Node",
+		"services":                     "Service",
+		"podstatus":                    "PodStatus",
+		"nodestatus":                   "NodeStatus",
+		"customresourcedefinitions":    "CustomResourceDefinition",
+		"customresourcedefinitionlist": "CustomResourceDefinitionList",
 	}
 	if v, isUnusual := unusualResourceToKind[r]; isUnusual {
 		return v
@@ -74,7 +78,11 @@ func UnsafeKindToResource(k string) string {
 		return k
 	}
 	unusualKindToResource := map[string]string{
-		"Endpoints": "endpoints",
+		"Endpoints":                    "endpoints",
+		"PodStatus":                    "podstatus",
+		"NodeStatus":                   "nodestatus",
+		"CustomResourceDefinition":     "customresourcedefinitions",
+		"CustomResourceDefinitionList": "customresourcedefinitionlist",
 	}
 	if v, isUnusual := unusualKindToResource[k]; isUnusual {
 		return v