Merge pull request #4719 from liangyuanpeng/cleanup_k8sutils_pointer

Cleanup the deprecated package of  k8s.io/utils/pointer.

examples/customresourceinterpreter/webhook/app/workloadwebhook.go

@@ -24,7 +24,7 @@ import (
 
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	workloadv1alpha1 "github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1"
 	configv1alpha1 "github.com/karmada-io/karmada/pkg/apis/config/v1alpha1"
@@ -142,9 +142,9 @@ func (e *workloadInterpreter) responseWithExploreAggregateStatus(workload *workl
 }
 
 func (e *workloadInterpreter) responseWithExploreInterpretHealth(workload *workloadv1alpha1.Workload) interpreter.Response {
-	healthy := pointer.Bool(false)
+	healthy := ptr.To[bool](false)
 	if workload.Status.ReadyReplicas == *workload.Spec.Replicas {
-		healthy = pointer.Bool(true)
+		healthy = ptr.To[bool](true)
 	}
 
 	res := interpreter.Succeeded("")

operator/pkg/apis/operator/v1alpha1/defaults.go

@@ -22,7 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	"github.com/karmada-io/karmada/operator/pkg/constants"
 	"github.com/karmada-io/karmada/pkg/version"
@@ -103,7 +103,7 @@ func setDefaultsHostCluster(obj *Karmada) {
 		hc.Networking = &Networking{}
 	}
 	if hc.Networking.DNSDomain == nil {
-		hc.Networking.DNSDomain = pointer.String(constants.KarmadaDefaultDNSDomain)
+		hc.Networking.DNSDomain = ptr.To[string](constants.KarmadaDefaultDNSDomain)
 	}
 }
 
@@ -118,7 +118,7 @@ func setDefaultsEtcd(obj *KarmadaComponents) {
 		}
 
 		if obj.Etcd.Local.Replicas == nil {
-			obj.Etcd.Local.Replicas = pointer.Int32(1)
+			obj.Etcd.Local.Replicas = ptr.To[int32](1)
 		}
 		if len(obj.Etcd.Local.Image.ImageRepository) == 0 {
 			obj.Etcd.Local.Image.ImageRepository = etcdImageRepository
@@ -154,10 +154,10 @@ func setDefaultsKarmadaAPIServer(obj *KarmadaComponents) {
 		apiserver.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if apiserver.Replicas == nil {
-		apiserver.Replicas = pointer.Int32(1)
+		apiserver.Replicas = ptr.To[int32](1)
 	}
 	if apiserver.ServiceSubnet == nil {
-		apiserver.ServiceSubnet = pointer.String(constants.KarmadaDefaultServiceSubnet)
+		apiserver.ServiceSubnet = ptr.To[string](constants.KarmadaDefaultServiceSubnet)
 	}
 	if len(apiserver.ServiceType) == 0 {
 		apiserver.ServiceType = corev1.ServiceTypeClusterIP
@@ -180,7 +180,7 @@ func setDefaultsKarmadaAggregatedAPIServer(obj *KarmadaComponents) {
 		aggregated.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if aggregated.Replicas == nil {
-		aggregated.Replicas = pointer.Int32(1)
+		aggregated.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -200,7 +200,7 @@ func setDefaultsKubeControllerManager(obj *KarmadaComponents) {
 		kubeControllerManager.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if kubeControllerManager.Replicas == nil {
-		kubeControllerManager.Replicas = pointer.Int32(1)
+		kubeControllerManager.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -220,7 +220,7 @@ func setDefaultsKarmadaControllerManager(obj *KarmadaComponents) {
 		karmadaControllerManager.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if karmadaControllerManager.Replicas == nil {
-		karmadaControllerManager.Replicas = pointer.Int32(1)
+		karmadaControllerManager.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -240,7 +240,7 @@ func setDefaultsKarmadaScheduler(obj *KarmadaComponents) {
 		scheduler.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if scheduler.Replicas == nil {
-		scheduler.Replicas = pointer.Int32(1)
+		scheduler.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -260,7 +260,7 @@ func setDefaultsKarmadaWebhook(obj *KarmadaComponents) {
 		webhook.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if webhook.Replicas == nil {
-		webhook.Replicas = pointer.Int32(1)
+		webhook.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -280,7 +280,7 @@ func setDefaultsKarmadaSearch(obj *KarmadaComponents) {
 		search.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if search.Replicas == nil {
-		search.Replicas = pointer.Int32(1)
+		search.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -300,7 +300,7 @@ func setDefaultsKarmadaDescheduler(obj *KarmadaComponents) {
 		descheduler.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if descheduler.Replicas == nil {
-		descheduler.Replicas = pointer.Int32(1)
+		descheduler.Replicas = ptr.To[int32](1)
 	}
 }
 
@@ -320,6 +320,6 @@ func setDefaultsKarmadaMetricsAdapter(obj *KarmadaComponents) {
 		metricsAdapter.ImagePullPolicy = corev1.PullIfNotPresent
 	}
 	if metricsAdapter.Replicas == nil {
-		metricsAdapter.Replicas = pointer.Int32(2)
+		metricsAdapter.Replicas = ptr.To[int32](2)
 	}
 }

pkg/apis/policy/v1alpha1/propagation_helper_test.go

@@ -19,7 +19,7 @@ package v1alpha1
 import (
 	"testing"
 
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestPropagationPolicy_ExplicitPriority(t *testing.T) {
@@ -34,7 +34,7 @@ func TestPropagationPolicy_ExplicitPriority(t *testing.T) {
 		},
 		{
 			name:             "expected to be declared priority in pp",
-			declaredPriority: pointer.Int32(20),
+			declaredPriority: ptr.To[int32](20),
 			expectedPriority: 20,
 		},
 	}
@@ -62,7 +62,7 @@ func TestClusterPropagationPolicy_ExplicitPriority(t *testing.T) {
 		},
 		{
 			name:             "expected to be declared priority in cpp",
-			declaredPriority: pointer.Int32(20),
+			declaredPriority: ptr.To[int32](20),
 			expectedPriority: 20,
 		},
 	}

pkg/apis/work/v1alpha2/binding_types_helper_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestResourceBindingSpec_TargetContains(t *testing.T) {
@@ -181,7 +181,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 				GracefulEvictionTasks: []GracefulEvictionTask{
 					{
 						FromCluster: "m1",
-						Replicas:    pointer.Int32(1),
+						Replicas:    ptr.To[int32](1),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction",
 						Producer:    EvictionProducerTaintManager,
@@ -205,7 +205,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 				GracefulEvictionTasks: []GracefulEvictionTask{
 					{
 						FromCluster: "m2",
-						Replicas:    pointer.Int32(2),
+						Replicas:    ptr.To[int32](2),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction",
 						Producer:    EvictionProducerTaintManager,
@@ -229,7 +229,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 				GracefulEvictionTasks: []GracefulEvictionTask{
 					{
 						FromCluster: "m3",
-						Replicas:    pointer.Int32(3),
+						Replicas:    ptr.To[int32](3),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction",
 						Producer:    EvictionProducerTaintManager,
@@ -257,7 +257,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 					},
 					{
 						FromCluster: "m3",
-						Replicas:    pointer.Int32(3),
+						Replicas:    ptr.To[int32](3),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction",
 						Producer:    EvictionProducerTaintManager,
@@ -277,7 +277,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 				GracefulEvictionTasks: []GracefulEvictionTask{
 					{
 						FromCluster: "m1",
-						Replicas:    pointer.Int32(1),
+						Replicas:    ptr.To[int32](1),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction v1",
 						Producer:    EvictionProducerTaintManager,
@@ -286,7 +286,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 			},
 			EvictEvent: GracefulEvictionTask{
 				FromCluster: "m1",
-				Replicas:    pointer.Int32(1),
+				Replicas:    ptr.To[int32](1),
 				Reason:      EvictionReasonTaintUntolerated,
 				Message:     "graceful eviction v2",
 				Producer:    EvictionProducerTaintManager,
@@ -296,7 +296,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
 				GracefulEvictionTasks: []GracefulEvictionTask{
 					{
 						FromCluster: "m1",
-						Replicas:    pointer.Int32(1),
+						Replicas:    ptr.To[int32](1),
 						Reason:      EvictionReasonTaintUntolerated,
 						Message:     "graceful eviction v1",
 						Producer:    EvictionProducerTaintManager,

pkg/controllers/applicationfailover/crb_application_failover_controller.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -165,7 +165,7 @@ func (c *CRBApplicationFailoverController) evictBinding(binding *workv1alpha2.Cl
 			}
 		case policyv1alpha1.Never:
 			if features.FeatureGate.Enabled(features.GracefulEviction) {
-				binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(CRBApplicationFailoverControllerName), workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(pointer.Bool(true))))
+				binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(CRBApplicationFailoverControllerName), workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(ptr.To[bool](true))))
 			} else {
 				err := fmt.Errorf("GracefulEviction featureGate must be enabled when purgeMode is %s", policyv1alpha1.Never)
 				klog.Error(err)

pkg/controllers/applicationfailover/rb_application_failover_controller.go

@@ -28,7 +28,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -167,7 +167,7 @@ func (c *RBApplicationFailoverController) evictBinding(binding *workv1alpha2.Res
 		case policyv1alpha1.Never:
 			if features.FeatureGate.Enabled(features.GracefulEviction) {
 				binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(RBApplicationFailoverControllerName),
-					workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(pointer.Bool(true))))
+					workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(ptr.To[bool](true))))
 			} else {
 				err := fmt.Errorf("GracefulEviction featureGate must be enabled when purgeMode is %s", policyv1alpha1.Never)
 				klog.Error(err)

pkg/controllers/gracefuleviction/evictiontask_test.go

@@ -22,7 +22,7 @@ import (
 	"time"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 
 	workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
 )
@@ -143,7 +143,7 @@ func Test_assessSingleTask(t *testing.T) {
 			args: args{
 				task: workv1alpha2.GracefulEvictionTask{
 					FromCluster:        "member1",
-					GracePeriodSeconds: pointer.Int32(30),
+					GracePeriodSeconds: ptr.To[int32](30),
 					CreationTimestamp:  &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 				},
 				opt: assessmentOption{
@@ -163,7 +163,7 @@ func Test_assessSingleTask(t *testing.T) {
 			args: args{
 				task: workv1alpha2.GracefulEvictionTask{
 					FromCluster:        "member1",
-					GracePeriodSeconds: pointer.Int32(120),
+					GracePeriodSeconds: ptr.To[int32](120),
 					CreationTimestamp:  &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 				},
 				opt: assessmentOption{
@@ -178,7 +178,7 @@ func Test_assessSingleTask(t *testing.T) {
 			},
 			want: &workv1alpha2.GracefulEvictionTask{
 				FromCluster:        "member1",
-				GracePeriodSeconds: pointer.Int32(120),
+				GracePeriodSeconds: ptr.To[int32](120),
 				CreationTimestamp:  &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 			},
 		},
@@ -187,7 +187,7 @@ func Test_assessSingleTask(t *testing.T) {
 			args: args{
 				task: workv1alpha2.GracefulEvictionTask{
 					FromCluster:       "member1",
-					SuppressDeletion:  pointer.Bool(true),
+					SuppressDeletion:  ptr.To[bool](true),
 					CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 				},
 				opt: assessmentOption{
@@ -202,7 +202,7 @@ func Test_assessSingleTask(t *testing.T) {
 			},
 			want: &workv1alpha2.GracefulEvictionTask{
 				FromCluster:       "member1",
-				SuppressDeletion:  pointer.Bool(true),
+				SuppressDeletion:  ptr.To[bool](true),
 				CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 			},
 		},
@@ -211,7 +211,7 @@ func Test_assessSingleTask(t *testing.T) {
 			args: args{
 				task: workv1alpha2.GracefulEvictionTask{
 					FromCluster:       "member1",
-					SuppressDeletion:  pointer.Bool(false),
+					SuppressDeletion:  ptr.To[bool](false),
 					CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
 				},
 				opt: assessmentOption{
@@ -594,7 +594,7 @@ func Test_nextRetry(t *testing.T) {
 					{
 						FromCluster:       "member1",
 						CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -60)},
-						SuppressDeletion:  pointer.Bool(true),
+						SuppressDeletion:  ptr.To[bool](true),
 					},
 					{
 						FromCluster:       "member2",
@@ -613,12 +613,12 @@ func Test_nextRetry(t *testing.T) {
 					{
 						FromCluster:       "member1",
 						CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -60)},
-						SuppressDeletion:  pointer.Bool(true),
+						SuppressDeletion:  ptr.To[bool](true),
 					},
 					{
 						FromCluster:       "member2",
 						CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -5)},
-						SuppressDeletion:  pointer.Bool(true),
+						SuppressDeletion:  ptr.To[bool](true),
 					},
 				},
 				timeout: timeout,

pkg/controllers/workloadrebalancer/workloadrebalancer_controller_test.go

@@ -26,7 +26,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -126,7 +126,7 @@ var (
 	ttlFinishedRebalancer = &appsv1alpha1.WorkloadRebalancer{
 		ObjectMeta: metav1.ObjectMeta{Name: "ttl-finished-rebalancer", CreationTimestamp: oneHourAgo},
 		Spec: appsv1alpha1.WorkloadRebalancerSpec{
-			TTLSecondsAfterFinished: pointer.Int32(5),
+			TTLSecondsAfterFinished: ptr.To[int32](5),
 			Workloads:               []appsv1alpha1.ObjectReference{deploy1Obj},
 		},
 		Status: appsv1alpha1.WorkloadRebalancerStatus{