Fix golint

Signed-off-by: Wenqi Qiu <wenqiq@vmware.com>

test/performance/config/config.go

@@ -15,7 +15,7 @@
 package config
 
 import (
-	"io/ioutil"
+	"os"
 	"time"
 
 	"gopkg.in/yaml.v2"
@@ -52,7 +52,7 @@ type ScaleList struct {
 
 func ParseConfigs(configPath string) (*ScaleList, error) {
 	scaleList := &ScaleList{}
-	data, err := ioutil.ReadFile(configPath)
+	data, err := os.ReadFile(configPath)
 	if err != nil {
 		return nil, err
 	}

test/performance/framework/exec.go

@@ -16,6 +16,7 @@ package framework
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"net/url"
 
@@ -43,7 +44,7 @@ func ExecURL(clientPod *corev1.Pod, kClient kubernetes.Interface, peerIP string)
 		}, scheme.ParameterCodec).URL()
 }
 
-func PingIP(kubeConfig *rest.Config, p kubernetes.Interface, pod *corev1.Pod, ip string) error {
+func PingIP(ctx context.Context, kubeConfig *rest.Config, p kubernetes.Interface, pod *corev1.Pod, ip string) error {
 	executor, err := remotecommand.NewSPDYExecutor(kubeConfig, "POST", ExecURL(pod, p, ip))
 	if err != nil {
 		return fmt.Errorf("error when creating SPDY executor: %w", err)
@@ -52,7 +53,7 @@ func PingIP(kubeConfig *rest.Config, p kubernetes.Interface, pod *corev1.Pod, ip
 	// Try to execute command with failure tolerant.
 	if err = utils.DefaultRetry(func() error {
 		var stdout, stderr bytes.Buffer
-		if err := executor.Stream(remotecommand.StreamOptions{Stdout: &stdout, Stderr: &stderr}); err != nil {
+		if err := executor.StreamWithContext(ctx, remotecommand.StreamOptions{Stdout: &stdout, Stderr: &stderr}); err != nil {
 			err := fmt.Errorf("executing commands on service client Pod error: %v", err)
 			// klog.ErrorS(err, "Check readiness of service", "ServiceName", svc.Name, "ClientPodName", clientPod.Name, "stdout", stdout.String(), "stderr", stderr.String())
 			return fmt.Errorf("ping ip %s error: %v, stdout:`%s`, stderr:`%s`, client pod: %s", ip, err, stdout.String(), stderr.String(), pod.Name)

test/performance/framework/networkpolicy.go

@@ -17,9 +17,10 @@ package framework
 import (
 	"context"
 	"fmt"
-	"k8s.io/klog/v2"
 	"time"
 
+	"k8s.io/klog/v2"
+
 	"antrea.io/antrea/test/performance/framework/networkpolicy"
 	"antrea.io/antrea/test/performance/utils"
 )
@@ -48,7 +49,7 @@ func ScaleNetworkPolicy(ctx context.Context, data *ScaleData) error {
 		if err != nil || fromPod == nil || ip == "" {
 			continue
 		}
-		if err := PingIP(data.kubeconfig, data.kubernetesClientSet, fromPod, ip); err != nil {
+		if err := PingIP(ctx, data.kubeconfig, data.kubernetesClientSet, fromPod, ip); err != nil {
 			return fmt.Errorf("the connection should be success, NetworkPolicyName: %s, FromPod: %s, ToPod: %s",
 				np.Name, fromPod.Name, ip)
 		}
@@ -58,7 +59,7 @@ func ScaleNetworkPolicy(ctx context.Context, data *ScaleData) error {
 		if err != nil || fromPod == nil || ip == "" {
 			continue
 		}
-		if err := PingIP(data.kubeconfig, data.kubernetesClientSet, fromPod, ip); err == nil {
+		if err := PingIP(ctx, data.kubeconfig, data.kubernetesClientSet, fromPod, ip); err == nil {
 			return fmt.Errorf("the connection should not be success, NetworkPolicyName: %s, FromPod: %s, ToPodIP: %s", np.Name, fromPod.Name, ip)
 		}
 		klog.InfoS("Checked networkPolicy", "Name", np.Name, "Namespace", np.Namespace, "count", i, "maxNum", maxNPCheckedCount)

test/performance/framework/networkpolicy/scale_up.go

@@ -35,16 +35,6 @@ var (
 	networkPolicyLabelKey = "antrea-scale-test-netpol"
 )
 
-func shuffle(s *[]corev1.Pod) {
-	slice := *s
-	n := len(slice)
-	for i := range slice {
-		j := int(utils.GenRandInt()) % n
-		slice[i], slice[j] = slice[j], slice[i]
-	}
-	*s = slice
-}
-
 func generateNetpolTemplate(labelNum int, ns string, isIngress bool) *netv1.NetworkPolicy {
 	name := uuid.New().String()
 	protocol := corev1.ProtocolTCP

test/performance/framework/pods.go

@@ -108,12 +108,13 @@ func ScaleUpWorkloadPods(ctx context.Context, data *ScaleData) error {
 		for i := 0; i < podNum; i++ {
 			index := i
 			time.Sleep(time.Duration(utils.GenRandInt()%100) * time.Millisecond)
+			labelNum := i/2 + 1
 			gErr.Go(func() error {
 				podName := fmt.Sprintf("antrea-scale-test-pod-%s", uuid.New().String())
-				pod := newWorkloadPod(podName, ns, true, i/2+1)
+				pod := newWorkloadPod(podName, ns, true, labelNum)
 				if !data.Specification.RealNode {
 					onRealNode := (index % data.nodesNum) >= data.simulateNodesNum
-					pod = newWorkloadPod(podName, ns, onRealNode, i/2+1)
+					pod = newWorkloadPod(podName, ns, onRealNode, labelNum)
 				}
 				if _, err := data.kubernetesClientSet.CoreV1().Pods(ns).Create(ctx, pod, metav1.CreateOptions{}); err != nil {
 					return err

test/performance/framework/scale_up.go

@@ -17,12 +17,12 @@ package framework
 import (
 	"context"
 	"fmt"
-	"k8s.io/apimachinery/pkg/api/errors"
 	"time"
 
 	"github.com/google/uuid"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"

test/performance/framework/service.go

@@ -49,7 +49,7 @@ func ScaleService(ctx context.Context, data *ScaleData) error {
 		k := int(utils.GenRandInt()) % len(data.clientPods)
 		clientPod := data.clientPods[k]
 		svc := svcs[i]
-		if err := PingIP(data.kubeconfig, data.kubernetesClientSet, &clientPod, svc.IP); err != nil {
+		if err := PingIP(ctx, data.kubeconfig, data.kubernetesClientSet, &clientPod, svc.IP); err != nil {
 			klog.ErrorS(err, "Check readiness of service error", "ClientPodName", clientPod.Name, "svc", svc)
 			return err
 		}