From ad332b33256b905c6074e7a8301cfdb14592ff92 Mon Sep 17 00:00:00 2001
From: sivchari <shibuuuu5@gmail.com>
Date: Tue, 4 Feb 2025 10:52:32 +0900
Subject: [PATCH] use std API instead of exp API

Signed-off-by: sivchari <shibuuuu5@gmail.com>
---
 go.mod                                                      | 2 +-
 internal/controllers/machine/drain/drain.go                 | 6 +++---
 internal/controllers/topology/cluster/current_state_test.go | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 6eca92897474..79c372f0eaa4 100644
--- a/go.mod
+++ b/go.mod
@@ -35,7 +35,7 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.5.18
 	go.etcd.io/etcd/client/v3 v3.5.18
 	go.uber.org/zap v1.27.0
-	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+	golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
 	golang.org/x/oauth2 v0.25.0
 	golang.org/x/text v0.21.0
 	gomodules.xyz/jsonpatch/v2 v2.4.0
diff --git a/internal/controllers/machine/drain/drain.go b/internal/controllers/machine/drain/drain.go
index 1fd43d2646a5..ab3de33fcae2 100644
--- a/internal/controllers/machine/drain/drain.go
+++ b/internal/controllers/machine/drain/drain.go
@@ -20,13 +20,14 @@ package drain
 import (
 	"context"
 	"fmt"
+	"maps"
 	"math"
+	"slices"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/pkg/errors"
-	"golang.org/x/exp/maps"
 	corev1 "k8s.io/api/core/v1"
 	policyv1 "k8s.io/api/policy/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -484,8 +485,7 @@ func (r EvictionResult) ConditionMessage(nodeDrainStartTime *metav1.Time) string
 			conditionMessage, kind, PodListToString(r.PodsDeletionTimestampSet, 3))
 	}
 	if len(r.PodsFailedEviction) > 0 {
-		sortedFailureMessages := maps.Keys(r.PodsFailedEviction)
-		sort.Strings(sortedFailureMessages)
+		sortedFailureMessages := slices.Sorted(maps.Keys(r.PodsFailedEviction))
 
 		skippedFailureMessages := []string{}
 		if len(sortedFailureMessages) > 5 {
diff --git a/internal/controllers/topology/cluster/current_state_test.go b/internal/controllers/topology/cluster/current_state_test.go
index efbec8ec75e6..d9fd34c2021a 100644
--- a/internal/controllers/topology/cluster/current_state_test.go
+++ b/internal/controllers/topology/cluster/current_state_test.go
@@ -17,12 +17,13 @@ limitations under the License.
 package cluster
 
 import (
+	"maps"
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/gomega"
-	"golang.org/x/exp/maps"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -1166,7 +1167,7 @@ func TestGetCurrentState(t *testing.T) {
 			}
 
 			// Don't compare the deletionTimestamps as there are some minor differences in how they are stored pre/post fake client.
-			for _, md := range append(maps.Values(got.MachineDeployments), maps.Values(tt.want.MachineDeployments)...) {
+			for _, md := range append(slices.Collect(maps.Values(got.MachineDeployments)), slices.Collect(maps.Values(tt.want.MachineDeployments))...) {
 				md.Object.DeletionTimestamp = nil
 			}