fix:修复sidecar无法获取到xds规则 (#1069)

polarismesh · Apr 7, 2023 · f292126 · f292126
1 parent cdb45a8
commit f292126
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apiserver/xdsserverv3/node.go b/apiserver/xdsserverv3/node.go
@@ -123,7 +123,7 @@ func (PolarisNodeHash) ID(node *core.Node) string {
 
 	runType, ns, _, _ := parseNodeID(node.Id)
 	if runType == string(RunTypeSidecar) {
-		ret := runType + sep + ns
+		ret := ns
 		if node.Metadata != nil && node.Metadata.Fields != nil {
 			tlsMode := node.Metadata.Fields[TLSModeTag].GetStringValue()
 			if tlsMode == TLSModePermissive || tlsMode == TLSModeStrict {

diff --git a/common/model/routing.go b/common/model/routing.go
@@ -91,7 +91,7 @@ func (r *ExtendRouterConfig) ToApi() (*apitraffic.RouteRule, error) {
 		}
 	}
 
-	return &apitraffic.RouteRule{
+	rule := &apitraffic.RouteRule{
 		Id:            r.ID,
 		Name:          r.Name,
 		Namespace:     r.Namespace,
@@ -104,7 +104,13 @@ func (r *ExtendRouterConfig) ToApi() (*apitraffic.RouteRule, error) {
 		Etime:         commontime.Time2String(r.EnableTime),
 		Priority:      r.Priority,
 		Description:   r.Description,
-	}, nil
+	}
+	if r.EnableTime.Year() > 2000 {
+		rule.Etime = commontime.Time2String(r.EnableTime)
+	} else {
+		rule.Etime = ""
+	}
+	return rule, nil
 }
 
 // RouterConfig Routing rules