Skip to content

Commit bc0688f

Browse files
committed
Use slices.Collect(maps.Keys(priorCaps)) after bumping to go1.23
1 parent 4a06caa commit bc0688f

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

pkg/cvo/sync_worker.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import (
44
"context"
55
"errors"
66
"fmt"
7+
"maps"
78
"math/rand"
89
"reflect"
10+
"slices"
911
"sort"
1012
"strings"
1113
"sync"
@@ -483,16 +485,8 @@ func (w *SyncWorker) Update(ctx context.Context, generation int64, desired confi
483485
return w.status.DeepCopy()
484486
}
485487

486-
// TODO: use slices.Collect(maps.Keys(priorCaps)) after bumping to go1.23
487-
collectKeys := func(caps map[configv1.ClusterVersionCapability]struct{}) []configv1.ClusterVersionCapability {
488-
var ret []configv1.ClusterVersionCapability
489-
for k := range caps {
490-
ret = append(ret, k)
491-
}
492-
return ret
493-
}
494488
// ensureEnabledCapabilities includes both explicitly and implicitly enabled capabilities
495-
ensureEnabledCapabilities := append(collectKeys(priorCaps), w.alwaysEnableCapabilities...)
489+
ensureEnabledCapabilities := append(slices.Collect(maps.Keys(priorCaps)), w.alwaysEnableCapabilities...)
496490
work.Capabilities = capability.SetCapabilities(config, ensureEnabledCapabilities)
497491

498492
versionEqual, overridesEqual, capabilitiesEqual :=

0 commit comments

Comments
 (0)