modernize: simplify code by using modern constructs (#5163)

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Author: oilbeater

build.mk

@@ -147,9 +147,11 @@ lint:
     ifeq ($(CI),true)
 		@echo "Running in GitHub Actions"
 		golangci-lint run -v
+		go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -test ./...
     else
 		@echo "Running in local environment"
 		golangci-lint run -v --fix
+		go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -test --fix ./...
     endif
 
 .PHONY: lint-windows

cmd/cni/cni.go

@@ -29,7 +29,7 @@ func main() {
 		Add: cmdAdd,
 		Del: cmdDel,
 	}
-	about := fmt.Sprintf("CNI kube-ovn plugin %s", versions.VERSION)
+	about := "CNI kube-ovn plugin " + versions.VERSION
 	skel.PluginMainFuncs(funcs, version.All, about)
 }
 
@@ -111,7 +111,7 @@ func generateCNIResult(cniResponse *request.CniResponse, netns string) current.R
 		var netMask *net.IPNet
 		var gwStr string
 		addRoutes := len(result.Routes) == 0
-		for _, cidrBlock := range strings.Split(cniResponse.CIDR, ",") {
+		for cidrBlock := range strings.SplitSeq(cniResponse.CIDR, ",") {
 			_, netMask, _ = net.ParseCIDR(cidrBlock)
 			gwStr = ""
 			if util.CheckProtocol(cidrBlock) == kubeovnv1.ProtocolIPv4 {
@@ -227,16 +227,16 @@ func parseValueFromArgs(key, argString string) (string, error) {
 	if argString == "" {
 		return "", types.NewError(types.ErrInvalidNetworkConfig, "Invalid Configuration", "CNI_ARGS is required")
 	}
-	args := strings.Split(argString, ";")
-	for _, arg := range args {
-		if strings.HasPrefix(arg, fmt.Sprintf("%s=", key)) {
-			value := strings.TrimPrefix(arg, fmt.Sprintf("%s=", key))
+	args := strings.SplitSeq(argString, ";")
+	for arg := range args {
+		if strings.HasPrefix(arg, key+"=") {
+			value := strings.TrimPrefix(arg, key+"=")
 			if len(value) > 0 {
 				return value, nil
 			}
 		}
 	}
-	return "", types.NewError(types.ErrInvalidNetworkConfig, "Invalid Configuration", fmt.Sprintf("%s is required in CNI_ARGS", key))
+	return "", types.NewError(types.ErrInvalidNetworkConfig, "Invalid Configuration", key+" is required in CNI_ARGS")
 }
 
 func assignV4Address(ipAddress, gateway string, mask *net.IPNet) (*current.IPConfig, *types.Route) {

cmd/daemon/cniserver.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"errors"
-	"fmt"
 	"net"
 	"net/http"
 	"net/http/pprof"
@@ -81,7 +80,7 @@ func main() {
 	stopCh := ctx.Done()
 	podInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(config.KubeClient, 0,
 		kubeinformers.WithTweakListOptions(func(listOption *v1.ListOptions) {
-			listOption.FieldSelector = fmt.Sprintf("spec.nodeName=%s", config.NodeName)
+			listOption.FieldSelector = "spec.nodeName=" + config.NodeName
 			listOption.AllowWatchBookmarks = true
 		}))
 	nodeInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(config.KubeClient, 0,

pkg/apis/kubeovn/v1/condition.go

@@ -41,10 +41,10 @@ type Condition struct {
 	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
 	// Last time the condition was probed
 	// +optional
-	LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
+	LastUpdateTime metav1.Time `json:"lastUpdateTime"`
 	// Last time the condition transitioned from one status to another.
 	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
+	LastTransitionTime metav1.Time `json:"lastTransitionTime"`
 }
 
 type Conditions []Condition

pkg/apis/kubeovn/v1/ip.go

@@ -18,7 +18,7 @@ type IPList struct {
 // +genclient:nonNamespaced
 type IP struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec IPSpec `json:"spec"`
 }

pkg/apis/kubeovn/v1/ippool.go

@@ -24,10 +24,10 @@ type IPPoolList struct {
 // +genclient:nonNamespaced
 type IPPool struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec   IPPoolSpec   `json:"spec"`
-	Status IPPoolStatus `json:"status,omitempty"`
+	Status IPPoolStatus `json:"status"`
 }
 
 type IPPoolSpec struct {

pkg/apis/kubeovn/v1/iptables-dnat-rule.go

@@ -22,10 +22,10 @@ type IptablesDnatRuleList struct {
 // +resourceName=iptables-dnat-rules
 type IptablesDnatRule struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec   IptablesDnatRuleSpec   `json:"spec"`
-	Status IptablesDnatRuleStatus `json:"status,omitempty"`
+	Status IptablesDnatRuleStatus `json:"status"`
 }
 
 type IptablesDnatRuleSpec struct {

pkg/apis/kubeovn/v1/iptables-eip.go

@@ -22,10 +22,10 @@ type IptablesEIPList struct {
 // +resourceName=iptables-eips
 type IptablesEIP struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec   IptablesEIPSpec   `json:"spec"`
-	Status IptablesEIPStatus `json:"status,omitempty"`
+	Status IptablesEIPStatus `json:"status"`
 }
 type IptablesEIPSpec struct {
 	V4ip           string `json:"v4ip"`

pkg/apis/kubeovn/v1/iptables-fip-rule.go

@@ -22,10 +22,10 @@ type IptablesFIPRuleList struct {
 // +resourceName=iptables-fip-rules
 type IptablesFIPRule struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec   IptablesFIPRuleSpec   `json:"spec"`
-	Status IptablesFIPRuleStatus `json:"status,omitempty"`
+	Status IptablesFIPRuleStatus `json:"status"`
 }
 type IptablesFIPRuleSpec struct {
 	EIP        string `json:"eip"`

pkg/apis/kubeovn/v1/iptables-snat-rule.go

@@ -22,10 +22,10 @@ type IptablesSnatRuleList struct {
 // +resourceName=iptables-snat-rules
 type IptablesSnatRule struct {
 	metav1.TypeMeta   `json:",inline"`
-	metav1.ObjectMeta `json:"metadata,omitempty"`
+	metav1.ObjectMeta `json:"metadata"`
 
 	Spec   IptablesSnatRuleSpec   `json:"spec"`
-	Status IptablesSnatRuleStatus `json:"status,omitempty"`
+	Status IptablesSnatRuleStatus `json:"status"`
 }
 
 type IptablesSnatRuleSpec struct {