fix lint

Signed-off-by: l1b0k <[email protected]>

Author: l1b0k

Makefile

@@ -51,7 +51,7 @@ vet: ## Run go vet against code.
 
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -race --tags "$(GO_BUILD_TAGS)" $$(go list ./... | grep -Ev '/e2e|/mocks|/generated|/apis|/examples|/tests') -coverprofile coverage.txt
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test -race --tags "$(GO_BUILD_TAGS)" $$(go list ./... | grep -Ev '/e2e|/mocks|/generated|/apis|/examples|/tests|/rpc') -coverprofile coverage.txt
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter & yamllint

cmd/terway-controlplane/terway-controlplane.go

@@ -39,8 +39,7 @@ import (
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
+	"k8s.io/klog/v2/textlogger"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -92,12 +91,13 @@ func main() {
 	)
 	flag.StringVar(&configFilePath, "config", "/etc/config/ctrl-config.yaml", "config file for controlplane")
 	flag.StringVar(&credentialFilePath, "credential", "/etc/credential/ctrl-secret.yaml", "secret file for controlplane")
-	klog.InitFlags(nil)
-	defer klog.Flush()
+
+	logCfg := textlogger.NewConfig()
+	logCfg.AddFlags(flag.CommandLine)
 
 	flag.Parse()
 
-	ctrl.SetLogger(klogr.New())
+	ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig()))
 	log.Info(version.Version)
 
 	ctx := ctrl.SetupSignalHandler()

cmd/terway/main.go

@@ -7,12 +7,13 @@ import (
 	"strings"
 	"time"
 
+	"k8s.io/klog/v2/textlogger"
+
 	"github.com/AliyunContainerService/terway/daemon"
 	"github.com/AliyunContainerService/terway/pkg/utils"
 	"github.com/AliyunContainerService/terway/pkg/version"
 
 	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
@@ -32,27 +33,25 @@ var (
 
 func main() {
 	rand.New(rand.NewSource(time.Now().UnixNano()))
-	klog.InitFlags(nil)
-	defer klog.Flush()
-
-	ctrl.SetLogger(klogr.New())
-	log.Info(version.Version)
 
 	fs := flag.NewFlagSet("terway", flag.ExitOnError)
-
 	fs.StringVar(&daemonMode, "daemon-mode", "VPC", "terway network mode")
 	fs.StringVar(&logLevel, "log-level", "info", "terway log level")
 	fs.StringVar(&readonlyListen, "readonly-listen", utils.NormalizePath(debugSocketPath), "terway readonly listen")
 	ctrl.RegisterFlags(fs)
-	klog.InitFlags(fs)
 
 	err := fs.Parse(os.Args[1:])
 	if err != nil {
 		panic(err)
 	}
+	var opts []textlogger.ConfigOption
+
 	if strings.ToLower(logLevel) == "debug" {
-		_ = fs.Set("v", "5")
+		opts = append(opts, textlogger.Verbosity(4))
 	}
+	ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig(opts...)))
+
+	log.Info(version.Version)
 
 	ctx := ctrl.SetupSignalHandler()
 	err = daemon.Run(ctx, utils.NormalizePath(defaultSocketPath), readonlyListen, utils.NormalizePath(defaultConfigPath), daemonMode)

pkg/controller/multi-ip/node/pool.go

@@ -59,13 +59,11 @@ const (
 var EventCh = make(chan event.GenericEvent, 1000)
 
 func Notify(ctx context.Context, name string) {
-	select {
-	case EventCh <- event.GenericEvent{
+	EventCh <- event.GenericEvent{
 		Object: &corev1.Node{ObjectMeta: metav1.ObjectMeta{Name: name}},
-	}:
-		if logf.FromContext(ctx).V(4).Enabled() {
-			logf.FromContext(ctx).Info("notify node event")
-		}
+	}
+	if logf.FromContext(ctx).V(4).Enabled() {
+		logf.FromContext(ctx).Info("notify node event")
 	}
 }
 

plugin/driver/utils/utils.go

@@ -3,7 +3,6 @@ package utils
 import (
 	"context"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"io"
 	"os"
@@ -13,8 +12,7 @@ import (
 	"github.com/alexflint/go-filemutex"
 	"github.com/go-logr/logr"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog/v2"
-	"k8s.io/klog/v2/klogr"
+	"k8s.io/klog/v2/textlogger"
 
 	"github.com/AliyunContainerService/terway/pkg/utils"
 )
@@ -27,19 +25,17 @@ var Log = logr.Discard()
 var once sync.Once
 
 func InitLog(debug bool) logr.Logger {
+	var opts []textlogger.ConfigOption
 	once.Do(func() {
 		if debug {
-			fs := flag.NewFlagSet("log", flag.ContinueOnError)
-			klog.InitFlags(fs)
-			_ = fs.Set("v", "4")
-			_ = fs.Set("logtostderr", "false")
 			var file, err = os.OpenFile(utils.NormalizePath("/var/log/terway.cni.log"), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 			if err != nil {
 				panic(err)
 			}
-			klog.SetOutput(io.MultiWriter(file, os.Stderr))
+			opts = append(opts, textlogger.Verbosity(4), textlogger.Output(io.MultiWriter(file, os.Stderr)))
+
 		}
-		Log = klogr.New()
+		Log = textlogger.NewLogger(textlogger.NewConfig(opts...))
 	})
 
 	return Log