Fix Go build for ipamd test package.

test/integration/ipamd/eni_ip_leak_test.go

@@ -3,6 +3,8 @@ package ipamd
 import (
 	"time"
 
+	v1 "k8s.io/api/core/v1"
+
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/manifest"
 	k8sUtils "github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/utils"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/utils"
@@ -15,6 +17,9 @@ const (
 	HOST_POD_LABEL_VAL = "host"
 )
 
+var primaryNode v1.Node
+var numOfNodes int
+
 var _ = Describe("[CANARY] ENI/IP Leak Test", func() {
 	Context("ENI/IP Released on Pod Deletion", func() {
 		BeforeEach(func() {

test/integration/ipamd/ipamd_suite_test.go

@@ -18,19 +18,10 @@ import (
 
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework"
 	k8sUtils "github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/utils"
-	"github.com/aws/aws-sdk-go/service/ec2"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	v1 "k8s.io/api/core/v1"
 )
 
-var err error
-var f *framework.Framework
-var primaryNode v1.Node
-var primaryInstance *ec2.Instance
-var numOfNodes int
-var addonDeleteError error
-
 func TestIPAMD(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecs(t, "VPC IPAMD Test Suite")

test/integration/ipamd/warm_target_test.go

@@ -171,24 +171,3 @@ var _ = Describe("test warm target variables", func() {
 		})
 	})
 })
-
-func Max(x, y int) int {
-	if x < y {
-		return y
-	}
-	return x
-}
-
-// MinIgnoreZero returns smaller of two number, if any number is zero returns the other number
-func MinIgnoreZero(x, y int) int {
-	if x == 0 {
-		return y
-	}
-	if y == 0 {
-		return x
-	}
-	if x < y {
-		return x
-	}
-	return y
-}

test/integration/ipamd/warm_target_test_PD_enabled.go

@@ -18,13 +18,20 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/aws/amazon-vpc-cni-k8s/test/framework"
+	"github.com/aws/aws-sdk-go/service/ec2"
+
 	k8sUtils "github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/utils"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/utils"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
+var primaryInstance *ec2.Instance
+var f *framework.Framework
+var err error
+
 // IMPORTANT: THE NODEGROUP TO RUN THE TEST MUST NOT HAVE ANY POD
 // Ideally we should drain the node, but drain from go client is non trivial
 // IMPORTANT: Only support nodes that can have 16+ Secondary IPV4s across at least 3 ENI
@@ -322,3 +329,24 @@ var _ = Describe("test warm target variables", func() {
 func ceil(x, y int) int {
 	return (x + y - 1) / y
 }
+
+func Max(x, y int) int {
+	if x < y {
+		return y
+	}
+	return x
+}
+
+// MinIgnoreZero returns smaller of two number, if any number is zero returns the other number
+func MinIgnoreZero(x, y int) int {
+	if x == 0 {
+		return y
+	}
+	if y == 0 {
+		return x
+	}
+	if x < y {
+		return x
+	}
+	return y
+}