Fix go-lint error

Signed-off-by: clarklee92 <[email protected]>
openkruise · Jun 21, 2024 · ad0744d · ad0744d
1 parent 782a250
commit ad0744d
Show file tree

Hide file tree

Showing 17 changed files with 180 additions and 160 deletions.
diff --git a/cloudprovider/alibabacloud/nlb_test.go b/cloudprovider/alibabacloud/nlb_test.go
@@ -7,7 +7,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sync"
@@ -278,8 +278,8 @@ func TestNlbPlugin_consSvc(t *testing.T) {
 							Kind:               "pod",
 							Name:               "test-pod",
 							UID:                "32fqwfqfew",
-							Controller:         pointer.BoolPtr(true),
-							BlockOwnerDeletion: pointer.BoolPtr(true),
+							Controller:         ptr.To[bool](true),
+							BlockOwnerDeletion: ptr.To[bool](true),
 						},
 					},
 				},

diff --git a/cloudprovider/alibabacloud/slb.go b/cloudprovider/alibabacloud/slb.go
@@ -19,23 +19,25 @@ package alibabacloud
 import (
 	"context"
 	"fmt"
-	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
-	"github.com/openkruise/kruise-game/cloudprovider"
-	cperrors "github.com/openkruise/kruise-game/cloudprovider/errors"
-	provideroptions "github.com/openkruise/kruise-game/cloudprovider/options"
-	"github.com/openkruise/kruise-game/cloudprovider/utils"
-	"github.com/openkruise/kruise-game/pkg/util"
+	"strconv"
+	"strings"
+	"sync"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	log "k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strconv"
-	"strings"
-	"sync"
+
+	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/cloudprovider"
+	cperrors "github.com/openkruise/kruise-game/cloudprovider/errors"
+	provideroptions "github.com/openkruise/kruise-game/cloudprovider/options"
+	"github.com/openkruise/kruise-game/cloudprovider/utils"
+	"github.com/openkruise/kruise-game/pkg/util"
 )
 
 const (
@@ -596,8 +598,8 @@ func getSvcOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod,
 			Kind:               pod.Kind,
 			Name:               pod.GetName(),
 			UID:                pod.GetUID(),
-			Controller:         pointer.BoolPtr(true),
-			BlockOwnerDeletion: pointer.BoolPtr(true),
+			Controller:         ptr.To[bool](true),
+			BlockOwnerDeletion: ptr.To[bool](true),
 		},
 	}
 	if isFixed {
@@ -609,8 +611,8 @@ func getSvcOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod,
 					Kind:               gss.Kind,
 					Name:               gss.GetName(),
 					UID:                gss.GetUID(),
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(true),
+					Controller:         ptr.To[bool](true),
+					BlockOwnerDeletion: ptr.To[bool](true),
 				},
 			}
 		}

diff --git a/cloudprovider/kubernetes/ingress.go b/cloudprovider/kubernetes/ingress.go
@@ -15,7 +15,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"strconv"
 	"strings"
@@ -222,7 +222,7 @@ func parseIngConfig(conf []gamekruiseiov1alpha1.NetworkConfParams, pod *corev1.P
 				return ingConfig{}, fmt.Errorf("%s", paramsError)
 			}
 		case IngressClassNameKey:
-			ic.ingressClassName = pointer.String(c.Value)
+			ic.ingressClassName = ptr.To[string](c.Value)
 		case TlsSecretNameKey:
 			ic.tlsSecretName = c.Value
 		case TlsHostsKey:
@@ -358,8 +358,8 @@ func consOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod, i
 			Kind:               pod.Kind,
 			Name:               pod.GetName(),
 			UID:                pod.GetUID(),
-			Controller:         pointer.BoolPtr(true),
-			BlockOwnerDeletion: pointer.BoolPtr(true),
+			Controller:         ptr.To[bool](true),
+			BlockOwnerDeletion: ptr.To[bool](true),
 		},
 	}
 	if isFixed {
@@ -371,8 +371,8 @@ func consOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod, i
 					Kind:               gss.Kind,
 					Name:               gss.GetName(),
 					UID:                gss.GetUID(),
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(true),
+					Controller:         ptr.To[bool](true),
+					BlockOwnerDeletion: ptr.To[bool](true),
 				},
 			}
 		}

diff --git a/cloudprovider/kubernetes/ingress_test.go b/cloudprovider/kubernetes/ingress_test.go
@@ -2,14 +2,16 @@ package kubernetes
 
 import (
 	"fmt"
-	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
-	"github.com/openkruise/kruise-game/pkg/util"
+	"reflect"
+	"testing"
+
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
-	"reflect"
-	"testing"
+	"k8s.io/utils/ptr"
+
+	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/pkg/util"
 )
 
 func TestParseIngConfig(t *testing.T) {
@@ -187,8 +189,8 @@ func TestConsIngress(t *testing.T) {
 				Kind:               "Pod",
 				Name:               "pod-3",
 				UID:                "bff0afd6-bb30-4641-8607-8329547324eb",
-				Controller:         pointer.BoolPtr(true),
-				BlockOwnerDeletion: pointer.BoolPtr(true),
+				Controller:         ptr.To[bool](true),
+				BlockOwnerDeletion: ptr.To[bool](true),
 			},
 		},
 	}
@@ -378,8 +380,8 @@ func TestConsSvc(t *testing.T) {
 				Kind:               "Pod",
 				Name:               "pod-3",
 				UID:                "bff0afd6-bb30-4641-8607-8329547324eb",
-				Controller:         pointer.BoolPtr(true),
-				BlockOwnerDeletion: pointer.BoolPtr(true),
+				Controller:         ptr.To[bool](true),
+				BlockOwnerDeletion: ptr.To[bool](true),
 			},
 		},
 	}

diff --git a/cloudprovider/kubernetes/nodeport_test.go b/cloudprovider/kubernetes/nodeport_test.go
@@ -1,14 +1,16 @@
 package kubernetes
 
 import (
-	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
-	"github.com/openkruise/kruise-game/pkg/util"
+	"reflect"
+	"testing"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
-	"reflect"
-	"testing"
+	"k8s.io/utils/ptr"
+
+	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/pkg/util"
 )
 
 func TestParseNPConfig(t *testing.T) {
@@ -89,8 +91,8 @@ func TestConsNPSvc(t *testing.T) {
 					Kind:               "Pod",
 					Name:               "pod-3",
 					UID:                "bff0afd6-bb30-4641-8607-8329547324eb",
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(true),
+					Controller:         ptr.To[bool](true),
+					BlockOwnerDeletion: ptr.To[bool](true),
 				},
 			},
 		},
@@ -139,8 +141,8 @@ func TestConsNPSvc(t *testing.T) {
 					Kind:               "Pod",
 					Name:               "pod-3",
 					UID:                "bff0afd6-bb30-4641-8607-8329547324eb",
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(true),
+					Controller:         ptr.To[bool](true),
+					BlockOwnerDeletion: ptr.To[bool](true),
 				},
 			},
 		},

diff --git a/cloudprovider/volcengine/clb.go b/cloudprovider/volcengine/clb.go
@@ -19,23 +19,25 @@ package volcengine
 import (
 	"context"
 	"fmt"
-	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
-	"github.com/openkruise/kruise-game/cloudprovider"
-	cperrors "github.com/openkruise/kruise-game/cloudprovider/errors"
-	provideroptions "github.com/openkruise/kruise-game/cloudprovider/options"
-	"github.com/openkruise/kruise-game/cloudprovider/utils"
-	"github.com/openkruise/kruise-game/pkg/util"
+	"strconv"
+	"strings"
+	"sync"
+
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	log "k8s.io/klog/v2"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"strconv"
-	"strings"
-	"sync"
+
+	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/cloudprovider"
+	cperrors "github.com/openkruise/kruise-game/cloudprovider/errors"
+	provideroptions "github.com/openkruise/kruise-game/cloudprovider/options"
+	"github.com/openkruise/kruise-game/cloudprovider/utils"
+	"github.com/openkruise/kruise-game/pkg/util"
 )
 
 const (
@@ -466,7 +468,7 @@ func (c *ClbPlugin) consSvc(config *clbConfig, pod *corev1.Pod, client client.Cl
 				SvcSelectorKey: pod.GetName(),
 			},
 			Ports:                         svcPorts,
-			AllocateLoadBalancerNodePorts: pointer.Bool(config.allocateLoadBalancerNodePorts),
+			AllocateLoadBalancerNodePorts: ptr.To[bool](config.allocateLoadBalancerNodePorts),
 		},
 	}
 	return svc
@@ -479,8 +481,8 @@ func getSvcOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod,
 			Kind:               pod.Kind,
 			Name:               pod.GetName(),
 			UID:                pod.GetUID(),
-			Controller:         pointer.BoolPtr(true),
-			BlockOwnerDeletion: pointer.BoolPtr(true),
+			Controller:         ptr.To[bool](true),
+			BlockOwnerDeletion: ptr.To[bool](true),
 		},
 	}
 	if isFixed {
@@ -492,8 +494,8 @@ func getSvcOwnerReference(c client.Client, ctx context.Context, pod *corev1.Pod,
 					Kind:               gss.Kind,
 					Name:               gss.GetName(),
 					UID:                gss.GetUID(),
-					Controller:         pointer.BoolPtr(true),
-					BlockOwnerDeletion: pointer.BoolPtr(true),
+					Controller:         ptr.To[bool](true),
+					BlockOwnerDeletion: ptr.To[bool](true),
 				},
 			}
 		}

diff --git a/cloudprovider/volcengine/clb_test.go b/cloudprovider/volcengine/clb_test.go
@@ -18,17 +18,18 @@ package volcengine
 
 import (
 	"context"
+	"k8s.io/utils/ptr"
 	"reflect"
 	"sync"
 	"testing"
 
-	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
-	"github.com/openkruise/kruise-game/pkg/util"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/pkg/util"
 )
 
 func TestAllocateDeAllocate(t *testing.T) {
@@ -314,8 +315,8 @@ func TestClbPlugin_consSvc(t *testing.T) {
 							Kind:               "pod",
 							Name:               "test-pod",
 							UID:                "32fqwfqfew",
-							Controller:         pointer.BoolPtr(true),
-							BlockOwnerDeletion: pointer.BoolPtr(true),
+							Controller:         ptr.To[bool](true),
+							BlockOwnerDeletion: ptr.To[bool](true),
 						},
 					},
 				},
@@ -334,7 +335,7 @@ func TestClbPlugin_consSvc(t *testing.T) {
 						},
 					},
 					},
-					AllocateLoadBalancerNodePorts: pointer.BoolPtr(true),
+					AllocateLoadBalancerNodePorts: ptr.To[bool](true),
 				},
 			},
 		},

diff --git a/main.go b/main.go
@@ -18,40 +18,37 @@ package main
 
 import (
 	"flag"
-
-	kruiseV1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
-	kruiseV1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
-	"github.com/openkruise/kruise-game/cloudprovider"
-	cpmanager "github.com/openkruise/kruise-game/cloudprovider/manager"
-	kruisegameclientset "github.com/openkruise/kruise-game/pkg/client/clientset/versioned"
-	kruisegamevisions "github.com/openkruise/kruise-game/pkg/client/informers/externalversions"
-	controller "github.com/openkruise/kruise-game/pkg/controllers"
-	"github.com/openkruise/kruise-game/pkg/externalscaler"
-	"github.com/openkruise/kruise-game/pkg/metrics"
-	"github.com/openkruise/kruise-game/pkg/webhook"
-	"google.golang.org/grpc"
-	"k8s.io/client-go/rest"
 	"net"
 	"os"
-
 	"time"
 
-	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
-	// to ensure that exec-entrypoint and run can make use of them.
-	_ "k8s.io/client-go/plugin/pkg/client/auth"
-
 	ackv1alpha1 "github.com/aws-controllers-k8s/elbv2-controller/apis/v1alpha1"
-	aliv1beta1 "github.com/openkruise/kruise-game/cloudprovider/alibabacloud/apis/v1beta1"
+	kruiseV1alpha1 "github.com/openkruise/kruise-api/apps/v1alpha1"
+	kruiseV1beta1 "github.com/openkruise/kruise-api/apps/v1beta1"
+	"google.golang.org/grpc"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
+	// to ensure that exec-entrypoint and run can make use of them.
+	_ "k8s.io/client-go/plugin/pkg/client/auth"
+	"k8s.io/client-go/rest"
 	elbv2api "sigs.k8s.io/aws-load-balancer-controller/apis/elbv2/v1beta1"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	gamekruiseiov1alpha1 "github.com/openkruise/kruise-game/apis/v1alpha1"
+	"github.com/openkruise/kruise-game/cloudprovider"
+	aliv1beta1 "github.com/openkruise/kruise-game/cloudprovider/alibabacloud/apis/v1beta1"
+	cpmanager "github.com/openkruise/kruise-game/cloudprovider/manager"
+	kruisegameclientset "github.com/openkruise/kruise-game/pkg/client/clientset/versioned"
+	kruisegamevisions "github.com/openkruise/kruise-game/pkg/client/informers/externalversions"
+	controller "github.com/openkruise/kruise-game/pkg/controllers"
+	"github.com/openkruise/kruise-game/pkg/externalscaler"
+	"github.com/openkruise/kruise-game/pkg/metrics"
 	utilclient "github.com/openkruise/kruise-game/pkg/util/client"
+	"github.com/openkruise/kruise-game/pkg/webhook"
 	//+kubebuilder:scaffold:imports
 )