Skip to content

Commit ea59b5d

Browse files
authored
Merge pull request #17 from kitianFresh/bugfix/fix-recommended-workload-rec-nil
fix nil workload rec data when container usage data is nil
2 parents b5ff87c + b092947 commit ea59b5d

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

pkg/cost-comparator/comparator.go

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,27 +1510,25 @@ func (c *Comparator) GetAllWorkloadRecommendedData() map[string]map[types.Namesp
15101510
}
15111511
}
15121512
}
1513+
}
1514+
wrd.RecommendedSpec = c.baselineCloud.Pod2ServerlessSpec(recPod)
1515+
wrd.RecommendedSpec.PodRef = recPod
1516+
wrd.RecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
15131517

1514-
wrd.RecommendedSpec = c.baselineCloud.Pod2ServerlessSpec(recPod)
1515-
wrd.RecommendedSpec.PodRef = recPod
1516-
wrd.RecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
1517-
1518-
maxRecSpec := c.baselineCloud.Pod2ServerlessSpec(maxRecPod)
1519-
maxRecSpec.PodRef = maxRecPod
1520-
wrd.MaxRecommendedSpec = &maxRecSpec
1521-
wrd.MaxRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
1522-
1523-
maxMarginRecSpec := c.baselineCloud.Pod2ServerlessSpec(maxMarginRecPod)
1524-
maxMarginRecSpec.PodRef = maxMarginRecPod
1525-
wrd.MaxMarginRecommendedSpec = &maxMarginRecSpec
1526-
wrd.MaxMarginRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
1518+
maxRecSpec := c.baselineCloud.Pod2ServerlessSpec(maxRecPod)
1519+
maxRecSpec.PodRef = maxRecPod
1520+
wrd.MaxRecommendedSpec = &maxRecSpec
1521+
wrd.MaxRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
15271522

1528-
percentRecSpec := c.baselineCloud.Pod2ServerlessSpec(pertRecPod)
1529-
percentRecSpec.PodRef = pertRecPod
1530-
wrd.PercentRecommendedSpec = &percentRecSpec
1531-
wrd.PercentRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
1523+
maxMarginRecSpec := c.baselineCloud.Pod2ServerlessSpec(maxMarginRecPod)
1524+
maxMarginRecSpec.PodRef = maxMarginRecPod
1525+
wrd.MaxMarginRecommendedSpec = &maxMarginRecSpec
1526+
wrd.MaxMarginRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
15321527

1533-
}
1528+
percentRecSpec := c.baselineCloud.Pod2ServerlessSpec(pertRecPod)
1529+
percentRecSpec.PodRef = pertRecPod
1530+
wrd.PercentRecommendedSpec = &percentRecSpec
1531+
wrd.PercentRecommendedSpec.GoodsNum = workloadPodSpec.GoodsNum
15341532
if klog.V(7).Enabled() {
15351533
data, _ := jsoniter.Marshal(wrd)
15361534
klog.V(7).Infof("Workload %v, %s", nn, wrd, string(data))

0 commit comments

Comments
 (0)