From c65663c529c7bf3a3980cb3bdda736191328c7a7 Mon Sep 17 00:00:00 2001 From: blackflytech Date: Wed, 1 Jul 2026 00:14:36 +0800 Subject: [PATCH] core: use slices.Backward to simplify the code Signed-off-by: blackflytech --- pkg/operator/ceph/cluster/osd/topology/topology.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/operator/ceph/cluster/osd/topology/topology.go b/pkg/operator/ceph/cluster/osd/topology/topology.go index 00b973c99..d06c92936 100644 --- a/pkg/operator/ceph/cluster/osd/topology/topology.go +++ b/pkg/operator/ceph/cluster/osd/topology/topology.go @@ -21,6 +21,7 @@ package topology import ( "fmt" + "slices" "sort" "strings" @@ -63,8 +64,7 @@ func ExtractOSDTopologyFromLabels(labels map[string]string) (map[string]string, func rookTopologyLabelsOrdered() []string { topologyLabelsOrdered := []string{} - for i := len(CRUSHTopologyLabels) - 1; i >= 0; i-- { - label := CRUSHTopologyLabels[i] + for _, label := range slices.Backward(CRUSHTopologyLabels) { topologyLabelsOrdered = append(topologyLabelsOrdered, topologyLabelPrefix+label) } return topologyLabelsOrdered @@ -113,8 +113,7 @@ func extractTopologyFromLabels(labels map[string]string) (map[string]string, str // iterate in lowest to highest order as the lowest level should be sustained and higher level duplicate // should be removed duplicateTopology := make(map[string][]string) - for i := len(allKubernetesTopologyLabels) - 1; i >= 0; i-- { - topologyLabel := allKubernetesTopologyLabels[i] + for _, topologyLabel := range slices.Backward(allKubernetesTopologyLabels) { if value, ok := labels[topologyLabel]; ok { if _, ok := duplicateTopology[value]; ok { delete(topology, kubernetesTopologyLabelToCRUSHLabel(topologyLabel))