Replace controller.Int32Ptr with k8s.io/utils/pointer.Int32Ptr (pingc…

…ap#2841) (pingcap#2845) * cherry pick pingcap#2841 to release-1.1 Signed-off-by: ti-srebot <ti-srebot@pingcap.com> * Delete tikv_group_member_manager.go Co-authored-by: Chunzhu Li <lichunzhu@stu.xjtu.edu.cn> Co-authored-by: Yecheng Fu <cofyc.jackson@gmail.com>
ti-srebot · Jul 1, 2020 · 217dffa · 217dffa
1 parent 18c2ea3
commit 217dffa
Show file tree

Hide file tree

Showing 19 changed files with 105 additions and 100 deletions.
diff --git a/pkg/backup/backup/backup_cleaner.go b/pkg/backup/backup/backup_cleaner.go
@@ -27,6 +27,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	batchlisters "k8s.io/client-go/listers/batch/v1"
 	"k8s.io/klog"
+	"k8s.io/utils/pointer"
 )
 
 // BackupCleaner implements the logic for cleaning backup
@@ -163,7 +164,7 @@ func (bc *backupCleaner) makeCleanJob(backup *v1alpha1.Backup) (*batchv1.Job, st
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: controller.Int32Ptr(constants.DefaultBackoffLimit),
+			BackoffLimit: pointer.Int32Ptr(constants.DefaultBackoffLimit),
 			Template:     *podSpec,
 		},
 	}

diff --git a/pkg/backup/backup/backup_manager.go b/pkg/backup/backup/backup_manager.go
@@ -32,6 +32,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	batchlisters "k8s.io/client-go/listers/batch/v1"
 	corelisters "k8s.io/client-go/listers/core/v1"
+	"k8s.io/utils/pointer"
 )
 
 type backupManager struct {
@@ -254,7 +255,7 @@ func (bm *backupManager) makeExportJob(backup *v1alpha1.Backup) (*batchv1.Job, s
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: controller.Int32Ptr(0),
+			BackoffLimit: pointer.Int32Ptr(0),
 			Template:     *podSpec,
 		},
 	}
@@ -384,7 +385,7 @@ func (bm *backupManager) makeBackupJob(backup *v1alpha1.Backup) (*batchv1.Job, s
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: controller.Int32Ptr(0),
+			BackoffLimit: pointer.Int32Ptr(0),
 			Template:     *podSpec,
 		},
 	}

diff --git a/pkg/backup/restore/restore_manager.go b/pkg/backup/restore/restore_manager.go
@@ -33,6 +33,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	batchlisters "k8s.io/client-go/listers/batch/v1"
 	corelisters "k8s.io/client-go/listers/core/v1"
+	"k8s.io/utils/pointer"
 )
 
 type restoreManager struct {
@@ -240,7 +241,7 @@ func (rm *restoreManager) makeImportJob(restore *v1alpha1.Restore) (*batchv1.Job
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: controller.Int32Ptr(0),
+			BackoffLimit: pointer.Int32Ptr(0),
 			Template:     *podSpec,
 		},
 	}
@@ -368,7 +369,7 @@ func (rm *restoreManager) makeRestoreJob(restore *v1alpha1.Restore) (*batchv1.Jo
 			},
 		},
 		Spec: batchv1.JobSpec{
-			BackoffLimit: controller.Int32Ptr(0),
+			BackoffLimit: pointer.Int32Ptr(0),
 			Template:     *podSpec,
 		},
 	}

diff --git a/pkg/controller/backupschedule/backup_schedule_controller_test.go b/pkg/controller/backupschedule/backup_schedule_controller_test.go
@@ -18,19 +18,19 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/pingcap/tidb-operator/pkg/backup/constants"
-
-	. "github.com/onsi/gomega"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
+	"github.com/pingcap/tidb-operator/pkg/backup/constants"
 	"github.com/pingcap/tidb-operator/pkg/client/clientset/versioned/fake"
 	informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions"
-	"github.com/pingcap/tidb-operator/pkg/controller"
+
+	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/util/workqueue"
+	"k8s.io/utils/pointer"
 )
 
 func TestBackupScheduleControllerEnqueueBackupSchedule(t *testing.T) {
@@ -179,7 +179,7 @@ func newBackupSchedule() *v1alpha1.BackupSchedule {
 		},
 		Spec: v1alpha1.BackupScheduleSpec{
 			Schedule:   "1 */10 * * *",
-			MaxBackups: controller.Int32Ptr(10),
+			MaxBackups: pointer.Int32Ptr(10),
 			BackupTemplate: v1alpha1.BackupSpec{
 				From: v1alpha1.TiDBAccessConfig{
 					Host:       "10.1.1.2",

diff --git a/pkg/controller/controller_utils.go b/pkg/controller/controller_utils.go
@@ -369,11 +369,6 @@ func setIfNotEmpty(container map[string]string, key, value string) {
 	}
 }
 
-// Int32Ptr returns a pointer to an int32
-func Int32Ptr(i int32) *int32 {
-	return &i
-}
-
 // RequestTracker is used by unit test for mocking request error
 type RequestTracker struct {
 	requests int

diff --git a/pkg/controller/generic_control_test.go b/pkg/controller/generic_control_test.go
@@ -18,15 +18,16 @@ import (
 	"testing"
 
 	"github.com/pingcap/tidb-operator/pkg/scheme"
+
+	. "github.com/onsi/gomega"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
+	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
-
-	. "github.com/onsi/gomega"
 )
 
 // TODO: more UTs
@@ -75,7 +76,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(1),
+					Replicas: pointer.Int32Ptr(1),
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							DNSPolicy: corev1.DNSClusterFirst,
@@ -86,7 +87,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 			mergeFn: mergeFn,
 			expectFn: func(g *GomegaWithT, c *FakeClientWithTracker, result *appsv1.Deployment, err error) {
 				g.Expect(err).To(Succeed())
-				g.Expect(result.Spec.Replicas).To(Equal(Int32Ptr(1)))
+				g.Expect(result.Spec.Replicas).To(Equal(pointer.Int32Ptr(1)))
 				g.Expect(c.CreateTracker.GetRequests()).To(Equal(1))
 				g.Expect(c.UpdateTracker.GetRequests()).To(Equal(0))
 			},
@@ -99,7 +100,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(1),
+					Replicas: pointer.Int32Ptr(1),
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							DNSPolicy: corev1.DNSClusterFirst,
@@ -113,7 +114,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(2),
+					Replicas: pointer.Int32Ptr(2),
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							DNSPolicy: corev1.DNSClusterFirstWithHostNet,
@@ -124,7 +125,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 			mergeFn: mergeFn,
 			expectFn: func(g *GomegaWithT, c *FakeClientWithTracker, result *appsv1.Deployment, err error) {
 				g.Expect(err).To(Succeed())
-				g.Expect(result.Spec.Replicas).To(Equal(Int32Ptr(2)))
+				g.Expect(result.Spec.Replicas).To(Equal(pointer.Int32Ptr(2)))
 				g.Expect(result.Spec.Template.Spec.DNSPolicy).To(Equal(corev1.DNSClusterFirstWithHostNet))
 				g.Expect(c.CreateTracker.GetRequests()).To(Equal(1))
 				g.Expect(c.UpdateTracker.GetRequests()).To(Equal(1))
@@ -138,7 +139,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(1),
+					Replicas: pointer.Int32Ptr(1),
 					Paused:   true,
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
@@ -153,7 +154,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(2),
+					Replicas: pointer.Int32Ptr(2),
 					Paused:   false,
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
@@ -165,7 +166,7 @@ func TestGenericControlInterface_CreateOrUpdate(t *testing.T) {
 			mergeFn: mergeFn,
 			expectFn: func(g *GomegaWithT, c *FakeClientWithTracker, result *appsv1.Deployment, err error) {
 				g.Expect(err).To(Succeed())
-				g.Expect(result.Spec.Replicas).To(Equal(Int32Ptr(2)))
+				g.Expect(result.Spec.Replicas).To(Equal(pointer.Int32Ptr(2)))
 				g.Expect(result.Spec.Template.Spec.DNSPolicy).To(Equal(corev1.DNSClusterFirstWithHostNet))
 				g.Expect(result.Spec.Paused).To(BeTrue())
 				g.Expect(c.CreateTracker.GetRequests()).To(Equal(1))
@@ -221,7 +222,7 @@ func TestCreateOrUpdateDeployment(t *testing.T) {
 			Selector: &metav1.LabelSelector{MatchLabels: map[string]string{
 				"k": "v",
 			}},
-			Replicas: Int32Ptr(1),
+			Replicas: pointer.Int32Ptr(1),
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
 					Labels: map[string]string{
@@ -244,7 +245,7 @@ func TestCreateOrUpdateDeployment(t *testing.T) {
 					Namespace: "default",
 				},
 				Spec: appsv1.DeploymentSpec{
-					Replicas: Int32Ptr(1),
+					Replicas: pointer.Int32Ptr(1),
 					Template: corev1.PodTemplateSpec{
 						Spec: corev1.PodSpec{
 							DNSPolicy: corev1.DNSClusterFirst,
@@ -271,7 +272,7 @@ func TestCreateOrUpdateDeployment(t *testing.T) {
 					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{
 						"k": "v",
 					}},
-					Replicas: Int32Ptr(1),
+					Replicas: pointer.Int32Ptr(1),
 					Template: corev1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{
 							Labels: map[string]string{
@@ -293,7 +294,7 @@ func TestCreateOrUpdateDeployment(t *testing.T) {
 					Selector: &metav1.LabelSelector{MatchLabels: map[string]string{
 						"k2": "v2",
 					}},
-					Replicas: Int32Ptr(2),
+					Replicas: pointer.Int32Ptr(2),
 					Template: corev1.PodTemplateSpec{
 						ObjectMeta: metav1.ObjectMeta{
 							Labels: map[string]string{
@@ -308,7 +309,7 @@ func TestCreateOrUpdateDeployment(t *testing.T) {
 			},
 			expectFn: func(g *GomegaWithT, c *FakeClientWithTracker, result *appsv1.Deployment, err error) {
 				g.Expect(err).To(Succeed())
-				g.Expect(result.Spec.Replicas).To(Equal(Int32Ptr(2)))
+				g.Expect(result.Spec.Replicas).To(Equal(pointer.Int32Ptr(2)))
 				g.Expect(result.Spec.Template.Spec.DNSPolicy).To(Equal(corev1.DNSClusterFirstWithHostNet))
 				g.Expect(result.Spec.Selector.MatchLabels["k"]).To(Equal("v"))
 				g.Expect(result.Spec.Template.Labels["k"]).To(Equal("v"))

diff --git a/pkg/manager/member/pd_member_manager.go b/pkg/manager/member/pd_member_manager.go
@@ -699,7 +699,7 @@ func getNewPDSetForTidbCluster(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (
 			OwnerReferences: []metav1.OwnerReference{controller.GetOwnerRef(tc)},
 		},
 		Spec: apps.StatefulSetSpec{
-			Replicas: controller.Int32Ptr(tc.Spec.PD.Replicas + int32(failureReplicas)),
+			Replicas: pointer.Int32Ptr(tc.Spec.PD.Replicas + int32(failureReplicas)),
 			Selector: pdLabel.LabelSelector(),
 			Template: corev1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
@@ -727,7 +727,7 @@ func getNewPDSetForTidbCluster(tc *v1alpha1.TidbCluster, cm *corev1.ConfigMap) (
 			UpdateStrategy: apps.StatefulSetUpdateStrategy{
 				Type: apps.RollingUpdateStatefulSetStrategyType,
 				RollingUpdate: &apps.RollingUpdateStatefulSetStrategy{
-					Partition: controller.Int32Ptr(tc.Spec.PD.Replicas + int32(failureReplicas)),
+					Partition: pointer.Int32Ptr(tc.Spec.PD.Replicas + int32(failureReplicas)),
 				}},
 		},
 	}

diff --git a/pkg/manager/member/pd_scaler_test.go b/pkg/manager/member/pd_scaler_test.go
@@ -31,6 +31,7 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/cache"
+	"k8s.io/utils/pointer"
 )
 
 func TestPDScalerScaleOut(t *testing.T) {
@@ -59,7 +60,7 @@ func TestPDScalerScaleOut(t *testing.T) {
 
 		oldSet := newStatefulSetForPDScale()
 		newSet := oldSet.DeepCopy()
-		newSet.Spec.Replicas = controller.Int32Ptr(7)
+		newSet.Spec.Replicas = pointer.Int32Ptr(7)
 
 		scaler, _, pvcIndexer, pvcControl := newFakePDScaler()
 
@@ -255,7 +256,7 @@ func TestPDScalerScaleIn(t *testing.T) {
 
 		oldSet := newStatefulSetForPDScale()
 		newSet := oldSet.DeepCopy()
-		newSet.Spec.Replicas = controller.Int32Ptr(3)
+		newSet.Spec.Replicas = pointer.Int32Ptr(3)
 
 		scaler, pdControl, pvcIndexer, pvcControl := newFakePDScaler()
 
@@ -442,7 +443,7 @@ func newStatefulSetForPDScale() *apps.StatefulSet {
 			Namespace: metav1.NamespaceDefault,
 		},
 		Spec: apps.StatefulSetSpec{
-			Replicas: controller.Int32Ptr(5),
+			Replicas: pointer.Int32Ptr(5),
 		},
 	}
 	return set