From d8cf8dc10a6cb6a5b76f3f6017e63b31715c1c05 Mon Sep 17 00:00:00 2001 From: luomingmeng Date: Wed, 26 Jun 2024 17:25:49 +0800 Subject: [PATCH] Compatible with spd with empty scope --- pkg/controller/spd/spd_indicator.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/controller/spd/spd_indicator.go b/pkg/controller/spd/spd_indicator.go index 3b0ffaaf0..02b4df6c2 100644 --- a/pkg/controller/spd/spd_indicator.go +++ b/pkg/controller/spd/spd_indicator.go @@ -229,6 +229,11 @@ func (sc *SPDController) mergeIndicatorStatus(spd *apiworkload.ServiceProfileDes } for i := 0; i < len(spd.Status.AggMetrics); i++ { + // todo skip merge metrics when scope is empty(legacy), it will be removed in the future + if spd.Status.AggMetrics[i].Scope == "" { + continue + } + if _, ok := sc.indicatorsStatusAggMetrics[spd.Status.AggMetrics[i].Scope]; !ok { klog.Infof("skip status metrics %v for spd %v", spd.Status.AggMetrics[i].Scope, spd.Name) spd.Status.AggMetrics = append(spd.Status.AggMetrics[:i], spd.Status.AggMetrics[i+1:]...)