modernize waitGroup

Signed-off-by: Mengxin Liu <[email protected]>

Author: oilbeater

.github/workflows/build-x86-image.yaml

@@ -24,7 +24,7 @@ env:
   # renovate: datasource=github-releases depName=kind packageName=kubernetes-sigs/kind
   KIND_VERSION: v0.29.0
   # renovate: datasource=github-releases depName=golangci-lint packageName=golangci/golangci-lint
-  GOLANGCI_LINT_VERSION: v2.1.6
+  GOLANGCI_LINT_VERSION: v2.4.0
   # renovate: datasource=github-releases depName=helm packageName=helm/helm
   HELM_VERSION: v3.18.3
   # renovate: datasource=github-releases depName=submariner packageName=submariner-io/submariner

.golangci.yml

@@ -37,6 +37,9 @@ linters:
       - linters:
           - revive
         text: VpcDnsList should be VpcDNSList
+      - linters:
+          - revive
+        text: avoid meaningless package names
       # Exclude gosec from running on tests files.
       - linters:
           - gosec
@@ -45,6 +48,12 @@ linters:
       - linters:
           - gosec
         path: test/
+      - linters:
+          - staticcheck
+        text: Endpoints is deprecated
+      - linters:
+          - staticcheck
+        text: EndpointSubset is deprecated
     paths:
       - third_party$
       - builtin$

pkg/util/arp.go

@@ -160,10 +160,7 @@ func ArpDetectIPConflict(nic, ip string, mac net.HardwareAddr) (net.HardwareAddr
 	var readErr error
 	var wg sync.WaitGroup
 	ch := make(chan net.HardwareAddr, 1)
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
+	wg.Go(func() {
 		for !time.Now().After(deadline) {
 			if readErr = client.SetReadDeadline(deadline); readErr != nil {
 				klog.Error(readErr)
@@ -201,7 +198,7 @@ func ArpDetectIPConflict(nic, ip string, mac net.HardwareAddr) (net.HardwareAddr
 				return
 			}
 		}
-	}()
+	})
 
 	dstMac := net.HardwareAddr{0xff, 0xff, 0xff, 0xff, 0xff, 0xff}
 	for i := range probeNum {

pkg/util/ndp.go

@@ -190,10 +190,7 @@ func DuplicateAddressDetection(iface, ip string) (bool, net.HardwareAddr, error)
 	errChan := make(chan error, 1)
 	macChan := make(chan net.HardwareAddr, 1)
 
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
+	wg.Go(func() {
 		buf := make([]byte, ifi.MTU+14)
 		for {
 			n, _, err := conn.ReadFrom(buf)
@@ -224,7 +221,7 @@ func DuplicateAddressDetection(iface, ip string) (bool, net.HardwareAddr, error)
 			errChan <- fmt.Errorf("failed to read from connection: %w", err)
 			return
 		}
-	}()
+	})
 
 LOOP:
 	for i := range dadMaxMulticastSolicit {

yamls/kind.yaml.j2

@@ -1,5 +1,5 @@
 {%- if k8s_version is not defined -%}
-  {%- set k8s_version = "v1.32.5" -%}
+  {%- set k8s_version = "v1.33.2" -%}
 {%- endif -%}
 {%- if kube_proxy_mode is not defined -%}
   {%- set kube_proxy_mode = "ipvs" -%}