Merge pull request #197 from peerless1024/refactor/fix_lint_error

Refactor/fix lint error

Makefile

@@ -3,11 +3,11 @@ ORG = polarismesh
 REPO = polaris-controller
 SIDECAR_INIT_REPO = polaris-sidecar-init
 ENVOY_SIDECAR_INIT_REPO = polaris-envoy-bootstrap-generator
-IMAGE_TAG = v1.7.1
+IMAGE_TAG = v1.7.2
 PLATFORMS = linux/amd64,linux/arm64
 
 .PHONY: all
-all: build-amd64 build-arm64 build-multi-arch-image \
+all: fmt build-amd64 build-arm64 build-multi-arch-image \
  	 build-sidecar-init build-envoy-sidecar-init push-image
 
 .PHONY: build-amd64
@@ -49,3 +49,20 @@ clean:
 	rm -rf bin
 	rm -rf polaris-controller-release*
 
+.PHONY: fmt
+fmt:  ## Run go fmt against code.
+	go fmt ./...
+
+.PHONY: generate-multi-arch-image
+generate-multi-arch-image: fmt build-amd64 build-arm64
+	@echo "------------------"
+	@echo "--> Generate multi-arch docker image to registry for polaris-controller"
+	@echo "------------------"
+	@docker buildx build -f ./docker/Dockerfile --tag $(ORG)/$(REPO):$(IMAGE_TAG) --platform $(PLATFORMS) ./
+
+.PHONY: push-multi-arch-image
+push-multi-arch-image: generate-multi-arch-image
+	@echo "------------------"
+	@echo "--> Push multi-arch docker image to registry for polaris-controller"
+	@echo "------------------"
+	@docker image push $(ORG)/$(REPO):$(IMAGE_TAG) --platform $(PLATFORMS)

cmd/polaris-controller/app/config.go

@@ -16,7 +16,7 @@
 package app
 
 import (
-	"io/ioutil"
+	"os"
 
 	"gopkg.in/yaml.v2"
 
@@ -65,7 +65,7 @@ type controllerConfig struct {
 }
 
 func readConfFromFile() (*controllerConfig, error) {
-	buf, err := ioutil.ReadFile(MeshFile)
+	buf, err := os.ReadFile(MeshFile)
 	if err != nil {
 		log.Errorf("read file error, %v", err)
 		return nil, err

cmd/polaris-controller/app/options/serve.go

@@ -95,7 +95,9 @@ func RunServer(
 		defer close(stoppedCh)
 		<-stopCh
 		ctx, cancel := context.WithTimeout(context.Background(), shutDownTimeout)
-		server.Shutdown(ctx)
+		if err := server.Shutdown(ctx); err != nil {
+			log.Warnf("server Shutdown error:%+v", err)
+		}
 		cancel()
 	}()
 

cmd/polaris-controller/app/polaris-controller-manager.go

@@ -18,7 +18,7 @@ package app
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"math/rand"
 	"net"
 	"net/http"
@@ -239,8 +239,8 @@ func assignFlags(rootCmd *cobra.Command) {
 
 func closeGrpcLog() {
 	var (
-		infoW    = ioutil.Discard
-		warningW = ioutil.Discard
+		infoW    = io.Discard
+		warningW = io.Discard
 		errorW   = os.Stderr
 	)
 	grpclog.SetLoggerV2(grpclog.NewLoggerV2(infoW, warningW, errorW))

cmd/polaris-controller/main.go

@@ -28,7 +28,7 @@ import (
 )
 
 func main() {
-	rand.Seed(time.Now().UnixNano())
+	rand.New(rand.NewSource(time.Now().UnixNano()))
 
 	command := app.NewPolarisControllerManagerCommand()
 	logs.InitLogs()

common/log/config.go

@@ -293,7 +293,7 @@ func Configure(optionsMap map[string]*Options) error {
 
 			// capture gRPC logging
 			if options.LogGrpc {
-				grpclog.SetLogger(zapgrpc.NewLogger(captureLogger.WithOptions(zap.AddCallerSkip(2))))
+				grpclog.SetLoggerV2(zapgrpc.NewLogger(captureLogger.WithOptions(zap.AddCallerSkip(2))))
 			}
 		}
 	}

pkg/cache/config_cache.go

@@ -40,11 +40,11 @@ func (csm *CachedConfigFileMap) Delete(key string) {
 func (csm *CachedConfigFileMap) Load(key string) (value *v1.ConfigMap, ok bool) {
 	v, ok := csm.sm.Load(key)
 	if v != nil {
-		value, ok2 := v.(*v1.ConfigMap)
+		result, ok2 := v.(*v1.ConfigMap)
 		if !ok2 {
 			ok = false
 		}
-		return value, ok
+		return result, ok
 	}
 	return value, ok
 }

pkg/cache/service_cache.go

@@ -40,11 +40,11 @@ func (csm *CachedServiceMap) Delete(key string) {
 func (csm *CachedServiceMap) Load(key string) (value *v1.Service, ok bool) {
 	v, ok := csm.sm.Load(key)
 	if v != nil {
-		value, ok2 := v.(*v1.Service)
+		result, ok2 := v.(*v1.Service)
 		if !ok2 {
 			ok = false
 		}
-		return value, ok
+		return result, ok
 	}
 	return value, ok
 }

pkg/controller/apis.go

@@ -275,7 +275,8 @@ func (p *PolarisController) compareInstanceUpdate(service *v1.Service, spec *add
 		// ttl 默认是5s
 		ttl, err := strconv.Atoi(ttlStr)
 		if err != nil {
-			ttl = 5
+			log.SyncNamingScope().Errorf("annotation 'polarismesh.cn/ttl' value: %s, converted to type int error %v",
+				ttlStr, err)
 		} else {
 			if ttl > 0 && ttl <= 60 {
 				healthCheck.Type = util.IntPtr(0)
@@ -317,10 +318,7 @@ func (p *PolarisController) compareInstanceUpdate(service *v1.Service, spec *add
 	}
 
 	if newMetadataStr == "" {
-		if isPolarisInstanceHasCustomMeta(oldMetadata) {
-			return true
-		}
-		return false
+		return isPolarisInstanceHasCustomMeta(oldMetadata)
 	}
 	newMetaMap := make(map[string]string)
 	err := json.Unmarshal([]byte(newMetadataStr), &newMetaMap)

pkg/controller/controller.go

@@ -285,10 +285,6 @@ func (p *PolarisController) process(t *Task) error {
 	return err
 }
 
-func (p *PolarisController) handleErr(err error, task *Task) {
-
-}
-
 // CounterPolarisService
 func (p *PolarisController) CounterPolarisService() {
 	serviceList, err := p.serviceLister.List(labels.Everything())

pkg/controller/endpoint.go

@@ -192,7 +192,7 @@ func (p *PolarisController) processSyncInstance(service *v1.Service) (err error)
 		fmt.Sprintf("%s Current polaris instance is %v", serviceMsg, currentIPs),
 		fmt.Sprintf("%s addIns %v deleteIns %v updateIns %v", serviceMsg, addIns, deleteIns, updateIns),
 	}
-	log.SyncNamingScope().Infof(strings.Join(msg, "\n"))
+	log.SyncNamingScope().Info(strings.Join(msg, "\n"))
 
 	var addInsErr, deleteInsErr, updateInsErr error
 

pkg/controller/namespace.go

@@ -68,11 +68,11 @@ func (p *PolarisController) onNamespaceUpdate(old, cur interface{}) {
 	// 3. 无 sync -> 有 sync，将 ns 下 service、configmap 加入队列，标志为 polaris 要处理的，即添加
 	// 4. 有 sync -> 无 sync，将 ns 下 service、configmap 加入队列，标志为 polaris 不需要处理的，即删除
 
-	operation := OperationEmpty
 	if !isOldSync && !isCurSync {
 		// 情况 1
 		return
 	}
+	var operation Operation
 	if isCurSync {
 		// 情况 2、3
 		operation = OperationAdd