diff --git a/cmd/clusterlink/agent/app/agent.go b/cmd/clusterlink/agent/app/agent.go
index 68447f5c2..6f8d5132a 100644
--- a/cmd/clusterlink/agent/app/agent.go
+++ b/cmd/clusterlink/agent/app/agent.go
@@ -37,10 +37,7 @@ func NewAgentCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {
diff --git a/cmd/clusterlink/floater/app/floater.go b/cmd/clusterlink/floater/app/floater.go
index 52534a01c..a56ed7838 100644
--- a/cmd/clusterlink/floater/app/floater.go
+++ b/cmd/clusterlink/floater/app/floater.go
@@ -33,10 +33,7 @@ func NewFloaterCommand(ctx context.Context) *cobra.Command {
 			if errs := opts.Validate(); len(errs) != 0 {
 				return errs.ToAggregate()
 			}
-			if err := Run(ctx, opts); err != nil {
-				return err
-			}
-			return nil
+			return Run(ctx, opts)
 		},
 		Args: func(cmd *cobra.Command, args []string) error {
 			for _, arg := range args {
diff --git a/pkg/clusterlink/agent-manager/auto_detect_controller.go b/pkg/clusterlink/agent-manager/auto_detect_controller.go
index 40c292506..202da78e4 100644
--- a/pkg/clusterlink/agent-manager/auto_detect_controller.go
+++ b/pkg/clusterlink/agent-manager/auto_detect_controller.go
@@ -97,6 +97,7 @@ func (r *AutoDetectReconciler) newClusterMapFunc() handler.MapFunc {
 	}
 }
 
+// nolint:revive
 func (r *AutoDetectReconciler) detectInterfaceName(ctx context.Context) (string, error) {
 	var Cluster kosmosv1alpha1.Cluster
 
diff --git a/pkg/clusterlink/network/adapter.go b/pkg/clusterlink/network/adapter.go
index c8ce08b80..bcc9cd0ce 100644
--- a/pkg/clusterlink/network/adapter.go
+++ b/pkg/clusterlink/network/adapter.go
@@ -108,7 +108,7 @@ func (n *DefaultNetWork) UpdateArps([]clusterlinkv1alpha1.Arp) error {
 	return ErrNotImplemented
 }
 
-func (n *DefaultNetWork) UpdateFdbs(fdbs []clusterlinkv1alpha1.Fdb) error {
+func (n *DefaultNetWork) UpdateFdbs(_ []clusterlinkv1alpha1.Fdb) error {
 	return ErrNotImplemented
 }
 
diff --git a/pkg/clusterlink/network/device.go b/pkg/clusterlink/network/device.go
index e30ca37b4..f3e903cdb 100644
--- a/pkg/clusterlink/network/device.go
+++ b/pkg/clusterlink/network/device.go
@@ -105,6 +105,7 @@ func createNewVxlanIface(name string, addrIPWithMask *netlink.Addr, vxlanId int,
 }
 
 // load device info from environment
+// nolint:revive
 func loadDevices() ([]clusterlinkv1alpha1.Device, error) {
 	ret := []clusterlinkv1alpha1.Device{}
 
@@ -113,9 +114,8 @@ func loadDevices() ([]clusterlinkv1alpha1.Device, error) {
 		if err != nil {
 			if errors.As(err, &netlink.LinkNotFoundError{}) {
 				continue
-			} else {
-				return nil, err
 			}
+			return nil, err
 		}
 
 		if vxlanIface.Type() != (&netlink.Vxlan{}).Type() {
@@ -230,11 +230,7 @@ func addDevice(d clusterlinkv1alpha1.Device) error {
 		return err
 	}
 
-	if err := updateDeviceConfig(d.Name, family); err != nil {
-		return err
-	}
-
-	return nil
+	return updateDeviceConfig(d.Name, family)
 }
 
 func deleteDevice(d clusterlinkv1alpha1.Device) error {
@@ -258,7 +254,7 @@ func deleteDevice(d clusterlinkv1alpha1.Device) error {
 
 func updateDeviceConfig(name string, ipFamily int) error {
 	if ipFamily == netlink.FAMILY_V6 {
-		if err := UpdateDefaultIp6tablesBehavior(name); err != nil {
+		if err := UpdateDefaultIP6tablesBehavior(name); err != nil {
 			return err
 		}
 		if err := EnableDisableIPV6ByIFaceNmae(name); err != nil {
@@ -281,7 +277,7 @@ func UpdateDefaultIptablesAndKernalConfig(name string, ipFamily int) error {
 
 	// ipv6
 	if ipFamily == netlink.FAMILY_V6 {
-		if err := UpdateDefaultIp6tablesBehavior(name); err != nil {
+		if err := UpdateDefaultIP6tablesBehavior(name); err != nil {
 			return err
 		}
 		if err := EnableDisableIPV6ByIFaceNmae(name); err != nil {
diff --git a/pkg/clusterlink/network/env.go b/pkg/clusterlink/network/env.go
index d47f5fde0..4ef739f90 100644
--- a/pkg/clusterlink/network/env.go
+++ b/pkg/clusterlink/network/env.go
@@ -38,7 +38,7 @@ func (w *WatchDog) AddTask(path string, contents []byte) {
 	w.WatchTasks = append(w.WatchTasks, WatchTask{Path: path, Contents: contents})
 }
 
-func (w *WatchDog) Watch(ctx context.Context) {
+func (w *WatchDog) Watch(_ context.Context) {
 	w.lock.Lock()
 	defer w.lock.Unlock()
 
@@ -60,7 +60,7 @@ func init() {
 	go wait.UntilWithContext(context.Background(), watchDog.Watch, 30*time.Second)
 }
 
-func UpdateDefaultIp6tablesBehavior(ifaceName string) error {
+func UpdateDefaultIP6tablesBehavior(ifaceName string) error {
 	iptableHandler, err := iptables.New(ipt.ProtocolIPv6)
 	if err != nil {
 		return err //nolint:wrapcheck  // Let the caller wrap it
diff --git a/pkg/clusterlink/network/iptables.go b/pkg/clusterlink/network/iptables.go
index 0d34b2b0b..99ed669e0 100644
--- a/pkg/clusterlink/network/iptables.go
+++ b/pkg/clusterlink/network/iptables.go
@@ -135,13 +135,11 @@ func translateChainName(key string, f bool) string {
 	}
 	if f {
 		return chainMap[key]
-	} else {
-		if chainMap["PREROUTING"] == key {
-			return "PREROUTING"
-		} else {
-			return "POSTROUTING"
-		}
 	}
+	if chainMap["PREROUTING"] == key {
+		return "PREROUTING"
+	}
+	return "POSTROUTING"
 }
 
 func groupByTableChain(records []IptablesRecord) map[string][]IptablesRecord {
diff --git a/pkg/clusterlink/network/neigh.go b/pkg/clusterlink/network/neigh.go
index bddab28de..06a96d8c1 100644
--- a/pkg/clusterlink/network/neigh.go
+++ b/pkg/clusterlink/network/neigh.go
@@ -12,11 +12,14 @@ import (
 type NeighType int
 
 const (
+	// nolint:revive
 	NEIGH_FDB NeighType = iota
+	// nolint:revive
 	NEIGH_ARP
 )
 
-var NEIGH_TYPE_MAP map[NeighType]string = map[NeighType]string{
+// nolint:revive
+var NEIGH_TYPE_MAP = map[NeighType]string{
 	NEIGH_ARP: "arp",
 	NEIGH_FDB: "fbd",
 }
diff --git a/pkg/clusterlink/network/route.go b/pkg/clusterlink/network/route.go
index 0ac83e772..34679c3e6 100644
--- a/pkg/clusterlink/network/route.go
+++ b/pkg/clusterlink/network/route.go
@@ -73,9 +73,8 @@ func loadRoutes() ([]clusterlinkv1alpha1.Route, error) {
 		if err != nil {
 			if errors.As(err, &netlink.LinkNotFoundError{}) {
 				continue
-			} else {
-				return nil, err
 			}
+			return nil, err
 		}
 		for _, r := range routes {
 			ret = append(ret, clusterlinkv1alpha1.Route{