From 548a115a434eabfe53e793425fc49aa9fe5c8aac Mon Sep 17 00:00:00 2001 From: Kanha gupta Date: Mon, 13 May 2024 18:08:41 +0530 Subject: [PATCH] few minor improvements Signed-off-by: Kanha gupta --- pkg/antctl/raw/check/cluster/test_checkcniexistence.go | 2 +- pkg/antctl/raw/check/cluster/test_checkk8sversion.go | 4 ++-- pkg/antctl/raw/check/cluster/test_checkovsloadable.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/antctl/raw/check/cluster/test_checkcniexistence.go b/pkg/antctl/raw/check/cluster/test_checkcniexistence.go index 9de591887c2..11a38024616 100644 --- a/pkg/antctl/raw/check/cluster/test_checkcniexistence.go +++ b/pkg/antctl/raw/check/cluster/test_checkcniexistence.go @@ -33,7 +33,7 @@ func (t *checkCNIExistence) Run(ctx context.Context, testContext *testContext) e command := []string{"ls", "-1", "/etc/cni/net.d"} output, _, err := check.ExecInPod(ctx, testContext.client, testContext.config, testContext.namespace, testContext.testPod.Name, "", command) if err != nil { - return fmt.Errorf("failed to execute command in Pod %s, error: %v", testContext.testPod.Name, err) + return fmt.Errorf("failed to execute command in Pod %s, error: %w", testContext.testPod.Name, err) } files := strings.Fields(output) if len(files) == 0 { diff --git a/pkg/antctl/raw/check/cluster/test_checkk8sversion.go b/pkg/antctl/raw/check/cluster/test_checkk8sversion.go index 482afc576fb..277de84b501 100644 --- a/pkg/antctl/raw/check/cluster/test_checkk8sversion.go +++ b/pkg/antctl/raw/check/cluster/test_checkk8sversion.go @@ -32,11 +32,11 @@ func (t *checkK8sVersion) Run(ctx context.Context, testContext *testContext) err discoveryClient := testContext.client.Discovery() serverVersion, err := discoveryClient.ServerVersion() if err != nil { - return fmt.Errorf("error getting server version: %v", err) + return fmt.Errorf("error getting server version: %w", err) } currentVersion, err := semver.Parse(strings.TrimPrefix(serverVersion.GitVersion, "v")) if err != nil { - return fmt.Errorf("error parsing server version: %v", err) + return fmt.Errorf("error parsing server version: %w", err) } minVersion, _ := semver.Parse("1.19") if currentVersion.GTE(minVersion) { diff --git a/pkg/antctl/raw/check/cluster/test_checkovsloadable.go b/pkg/antctl/raw/check/cluster/test_checkovsloadable.go index 020016622e6..a27d501eee3 100644 --- a/pkg/antctl/raw/check/cluster/test_checkovsloadable.go +++ b/pkg/antctl/raw/check/cluster/test_checkovsloadable.go @@ -36,7 +36,7 @@ func (c *checkOVSLoadable) Run(ctx context.Context, testContext *testContext) er } stdout, stderr, err := check.ExecInPod(ctx, testContext.client, testContext.config, testContext.namespace, testContext.testPod.Name, "", command) if err != nil { - return fmt.Errorf("error executing command in Pod %s: %v", testContext.testPod.Name, err) + return fmt.Errorf("error executing command in Pod %s: %w", testContext.testPod.Name, err) } if strings.TrimSpace(stdout) == "0" { testContext.Log("The kernel module openvswitch is built-in") @@ -45,14 +45,14 @@ func (c *checkOVSLoadable) Run(ctx context.Context, testContext *testContext) er cmd := []string{"modprobe", "openvswitch"} _, stderr, err := check.ExecInPod(ctx, testContext.client, testContext.config, testContext.namespace, testContext.testPod.Name, "", cmd) if err != nil { - return fmt.Errorf("error executing modprobe command in Pod %s: %v", testContext.testPod.Name, err) + return fmt.Errorf("error executing modprobe command in Pod %s: %w", testContext.testPod.Name, err) } else if stderr != "" { return fmt.Errorf("failed to load the OVS kernel module: %s, try running 'modprobe openvswitch' on your Nodes", stderr) } else { testContext.Log("openvswitch kernel module loaded successfully") } } else { - return fmt.Errorf("error encountered while check if cni is existent - stderr: %s", stderr) + return fmt.Errorf("error encountered while checking if openvswitch module is built-in - stderr: %s", stderr) } return nil }