feat(tests): add warm up tests

Signed-off-by: l1b0k <[email protected]>

Author: l1b0k

docs/warm-up.md

@@ -26,6 +26,7 @@ The warm-up size can be configured through the `eni-config` ConfigMap:
 **Important**: The `ip_warm_up_size` is independent of `min_pool_size` and `max_pool_size`. It can be set to a value larger or smaller than the pool size limits.
 
 However, setting `ip_warm_up_size` larger than `max_pool_size` is **not recommended** because:
+
 - The warm-up process will allocate IPs up to `ip_warm_up_size`
 - After warm-up completes, the pool management and idle IP reclaim policy will release excess IPs to maintain the pool within `min_pool_size` and `max_pool_size` boundaries
 - This results in unnecessary IP allocation and deallocation, wasting resources and API calls
@@ -42,6 +43,7 @@ However, setting `ip_warm_up_size` larger than `max_pool_size` is **not recommen
 ```
 
 In this example:
+
 - On node startup, 15 IPs will be pre-allocated (warm-up)
 - The pool will maintain between 5-20 IPs during normal operation
 - Since `ip_warm_up_size` (15) is within the pool size range (5-20), all pre-allocated IPs will be retained
@@ -58,6 +60,7 @@ In this example:
 ```
 
 In this example:
+
 - On node startup, 20 IPs will be pre-allocated (warm-up)
 - After warm-up completes, 10 IPs will be released because `max_pool_size` is only 10
 - This causes unnecessary IP churn and API calls
@@ -94,4 +97,3 @@ status:
 - Warm-up only runs once per node lifecycle (when the node first joins the cluster)
 - If a node already has warm-up status initialized, changing `ip_warm_up_size` will not affect the ongoing warm-up
 - Warm-up progress is tracked independently of actual IP usage, ensuring consistent behavior even if IPs are allocated/deallocated during warm-up
-

tests/config_test.go

@@ -34,22 +34,13 @@ func TestIPPool(t *testing.T) {
 			}
 
 			// Check terway daemonset name is terway-eniip
-			isTerwayENIIP, err := CheckTerwayDaemonSetName(ctx, config, "terway-eniip")
-			if err != nil {
-				t.Fatalf("failed to check terway daemonset name: %v", err)
-			}
-			if !isTerwayENIIP {
-				t.Skipf("TestIPPool requires terway-eniip daemonset")
+			if GetCachedTerwayDaemonSetName() != "terway-eniip" {
+				t.Skipf("TestIPPool requires terway-eniip daemonset, current: %s", GetCachedTerwayDaemonSetName())
 			}
 
 			// Check terway version >= v1.16.1
-			versionOK, err := CheckTerwayVersion(ctx, config, "v1.16.1")
-			if err != nil {
-				t.Fatalf("failed to check terway version: %v", err)
-			}
-			if !versionOK {
-				terwayVersion, _ := GetTerwayVersion(ctx, config)
-				t.Skipf("TestIPPool requires terway version >= v1.16.1, current version: %s", terwayVersion)
+			if !RequireTerwayVersion("v1.16.1") {
+				t.Skipf("TestIPPool requires terway version >= v1.16.1, current version: %s", GetCachedTerwayVersion())
 			}
 
 			return ctx
@@ -269,6 +260,8 @@ func TestIPPool(t *testing.T) {
 					}
 					if idle > 0 {
 						t.Logf("node %v has %v idle ip", node.Name, idle)
+						_ = triggerNode(ctx, config, t, &node)
+
 						return false, nil
 					}
 				}

tests/connective_test.go

@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"golang.org/x/mod/semver"
 	corev1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -578,25 +577,13 @@ func TestNormal_HostPort(t *testing.T) {
 		hostPortNodeIP := features.New(fmt.Sprintf("HostPort/NodeIP-%s", name)).
 			Setup(func(ctx context.Context, t *testing.T, config *envconf.Config) context.Context {
 				// Check terway version >= v1.15.0
-				versionOK, err := CheckTerwayVersion(ctx, config, "v1.15.0")
-				if err != nil {
-					t.Fatalf("failed to check terway version: %v", err)
-				}
-				if !versionOK {
-					terwayVersion, _ := GetTerwayVersion(ctx, config)
-					t.Skipf("TestNormal_HostPort requires terway version >= v1.15.0, current version: %s", terwayVersion)
+				if !RequireTerwayVersion("v1.15.0") {
+					t.Skipf("TestNormal_HostPort requires terway version >= v1.15.0, current version: %s", GetCachedTerwayVersion())
 				}
 
 				// Check k8s version >= v1.34.0
-				k8sVersion, err := GetK8sVersion(ctx, config)
-				if err != nil {
-					t.Fatalf("failed to get k8s version: %v", err)
-				}
-				if !semver.IsValid(k8sVersion) {
-					t.Fatalf("invalid k8s version: %s", k8sVersion)
-				}
-				if semver.Compare(k8sVersion, "v1.34.0") < 0 {
-					t.Skipf("TestNormal_HostPort requires k8s version >= v1.34.0, current version: %s", k8sVersion)
+				if !RequireK8sVersion("v1.34.0") {
+					t.Skipf("TestNormal_HostPort requires k8s version >= v1.34.0, current version: %s", GetCachedK8sVersion())
 				}
 
 				// Check if nodes have no-kube-proxy label (kube-proxy replacement / Datapath V2)
@@ -726,30 +713,18 @@ func TestNormal_HostPort(t *testing.T) {
 		hostPortExternalIP := features.New(fmt.Sprintf("HostPort/ExternalIP-%s", name)).
 			Setup(func(ctx context.Context, t *testing.T, config *envconf.Config) context.Context {
 				// Check terway version >= v1.15.0
-				versionOK, err := CheckTerwayVersion(ctx, config, "v1.15.0")
-				if err != nil {
-					t.Fatalf("failed to check terway version: %v", err)
-				}
-				if !versionOK {
-					terwayVersion, _ := GetTerwayVersion(ctx, config)
-					t.Skipf("TestNormal_HostPort requires terway version >= v1.15.0, current version: %s", terwayVersion)
+				if !RequireTerwayVersion("v1.15.0") {
+					t.Skipf("TestNormal_HostPort requires terway version >= v1.15.0, current version: %s", GetCachedTerwayVersion())
 				}
 
 				// Check k8s version >= v1.34.0
-				k8sVersion, err := GetK8sVersion(ctx, config)
-				if err != nil {
-					t.Fatalf("failed to get k8s version: %v", err)
-				}
-				if !semver.IsValid(k8sVersion) {
-					t.Fatalf("invalid k8s version: %s", k8sVersion)
-				}
-				if semver.Compare(k8sVersion, "v1.34.0") < 0 {
-					t.Skipf("TestNormal_HostPort requires k8s version >= v1.34.0, current version: %s", k8sVersion)
+				if !RequireK8sVersion("v1.34.0") {
+					t.Skipf("TestNormal_HostPort requires k8s version >= v1.34.0, current version: %s", GetCachedK8sVersion())
 				}
 
 				// Check if any node has external IP before running the test
 				nodes := &corev1.NodeList{}
-				err = config.Client().Resources().List(ctx, nodes)
+				err := config.Client().Resources().List(ctx, nodes)
 				if err != nil {
 					t.Fatalf("failed to list nodes: %v", err)
 				}

tests/idle_ip_reclaim_test.go

@@ -74,34 +74,32 @@ func cleanupPoolConfig(ctx context.Context, t *testing.T, config *envconf.Config
 // TestIdleIPReclaimPolicy tests the idle IP reclaim policy feature
 // This test only covers centralized IPAM mode (ipam_type == "crd")
 func TestIdleIPReclaimPolicy(t *testing.T) {
-	feature := features.New("IdleIPReclaimPolicy").
-		Setup(func(ctx context.Context, t *testing.T, config *envconf.Config) context.Context {
-			// Only test centralized IPAM mode
-			if eniConfig.IPAMType != "crd" {
-				t.Skipf("skip: ipam type is not crd, current type: %s", eniConfig.IPAMType)
-			}
+	// Pre-check: only test centralized IPAM mode
+	if eniConfig == nil || eniConfig.IPAMType != "crd" {
+		ipamType := ""
+		if eniConfig != nil {
+			ipamType = eniConfig.IPAMType
+		}
+		t.Skipf("skip: ipam type is not crd, current type: %s", ipamType)
+		return
+	}
 
-			// Check terway daemonset name is terway-eniip
-			isTerwayENIIP, err := CheckTerwayDaemonSetName(ctx, config, "terway-eniip")
-			if err != nil {
-				t.Fatalf("failed to check terway daemonset name: %v", err)
-			}
-			if !isTerwayENIIP {
-				t.Skipf("TestIdleIPReclaimPolicy requires terway-eniip daemonset")
-			}
+	// Pre-check: terway daemonset name must be terway-eniip
+	if terway != "terway-eniip" {
+		t.Skipf("TestIdleIPReclaimPolicy requires terway-eniip daemonset, current: %s", terway)
+		return
+	}
 
-			// Check terway version >= v1.16.1
-			versionOK, err := CheckTerwayVersion(ctx, config, "v1.16.1")
-			if err != nil {
-				t.Fatalf("failed to check terway version: %v", err)
-			}
-			if !versionOK {
-				terwayVersion, _ := GetTerwayVersion(ctx, config)
-				t.Skipf("TestIdleIPReclaimPolicy requires terway version >= v1.16.1, current version: %s", terwayVersion)
-			}
+	// Pre-check: terway version must be >= v1.16.1
+	if !RequireTerwayVersion("v1.16.1") {
+		t.Skipf("TestIdleIPReclaimPolicy requires terway version >= v1.16.1, current version: %s", GetCachedTerwayVersion())
+		return
+	}
 
+	feature := features.New("IdleIPReclaimPolicy").
+		Setup(func(ctx context.Context, t *testing.T, config *envconf.Config) context.Context {
 			// Cleanup pool configuration before tests
-			err = cleanupPoolConfig(ctx, t, config)
+			err := cleanupPoolConfig(ctx, t, config)
 			if err != nil {
 				t.Fatalf("failed to cleanup pool configuration: %v", err)
 			}

tests/main_test.go

@@ -51,6 +51,7 @@ var (
 
 	terway        string
 	terwayVersion string
+	k8sVersion    string
 
 	vSwitchIDs       string
 	securityGroupIDs string
@@ -107,10 +108,16 @@ func TestMain(m *testing.M) {
 		checkENIConfig,
 	)
 	testenv.AfterEachFeature(func(ctx context.Context, config *envconf.Config, t *testing.T, feature features.Feature) (context.Context, error) {
+		// If test was skipped, don't do anything
+		if t.Skipped() {
+			t.Log("Test was skipped, cleaning up")
+			return ctx, nil
+		}
+
 		pod := &corev1.PodList{}
 		err = config.Client().Resources(envCfg.Namespace()).List(ctx, pod)
 		t.Log("---------list pods---------")
-		// 遍历 Pod 列表，筛选出非 Running 状态的 Pod
+		// Filter pods that are not in Running state
 		isTestFailed := false
 		for _, printPod := range pod.Items {
 			if printPod.Status.Phase != corev1.PodRunning {
@@ -120,7 +127,7 @@ func TestMain(m *testing.M) {
 		}
 		if isTestFailed {
 			t.Log("---------list events---------")
-			// 遍历 Event 列表
+			// List events
 			event := &corev1.EventList{}
 			err = config.Client().Resources(envCfg.Namespace()).List(ctx, event)
 			for _, printEvent := range event.Items {
@@ -158,13 +165,41 @@ func checkENIConfig(ctx context.Context, config *envconf.Config) (context.Contex
 		case "terway", "terway-eni", "terway-eniip":
 			terway = d.Name
 
-			tag := strings.Split(d.Spec.Template.Spec.Containers[0].Image, ":")[1]
-			terwayVersion = tag
+			// Get version from the first init container's image tag (more reliable)
+			if len(d.Spec.Template.Spec.InitContainers) > 0 {
+				image := d.Spec.Template.Spec.InitContainers[0].Image
+				parts := strings.Split(image, ":")
+				if len(parts) >= 2 {
+					terwayVersion = parts[len(parts)-1]
+				}
+			} else if len(d.Spec.Template.Spec.Containers) > 0 {
+				// Fallback to container image tag
+				image := d.Spec.Template.Spec.Containers[0].Image
+				parts := strings.Split(image, ":")
+				if len(parts) >= 2 {
+					terwayVersion = parts[len(parts)-1]
+				}
+			}
 
 			break
 		}
 	}
 
+	// Get k8s version from node
+	nodes := &corev1.NodeList{}
+	err = config.Client().Resources().List(ctx, nodes)
+	if err != nil {
+		return ctx, err
+	}
+	if len(nodes.Items) > 0 {
+		k8sVersion = nodes.Items[0].Status.NodeInfo.KubeletVersion
+		if !strings.HasPrefix(k8sVersion, "v") {
+			k8sVersion = "v" + k8sVersion
+		}
+	}
+
+	fmt.Printf("Detected terway daemonset: %s, version: %s, k8s version: %s\n", terway, terwayVersion, k8sVersion)
+
 	// we can determine cluster config by terway eni-conifg
 	cm := &corev1.ConfigMap{}
 	err = config.Client().Resources().Get(ctx, "eni-config", "kube-system", cm)

tests/multi_network_test.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
+	"golang.org/x/mod/semver"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/e2e-framework/klient/wait"
@@ -66,12 +67,24 @@ func (c *MultiNetworkConfig) HasCustomConfig() bool {
 
 // TestMultiNetwork tests multi-network functionality across different node types
 func TestMultiNetwork(t *testing.T) {
-	// Check terway daemonset name is terway-eniip
+	// Pre-check: terway daemonset name must be terway-eniip
 	if terway != "terway-eniip" {
-		t.Logf("TestMultiNetwork requires terway-eniip daemonset, current: %s, skipping", terway)
+		t.Skipf("TestMultiNetwork requires terway-eniip daemonset, current: %s", terway)
 		return
 	}
 
+	// Pre-check: terway version must be >= v1.16.1
+	if terwayVersion != "" {
+		version := terwayVersion
+		if !strings.HasPrefix(version, "v") {
+			version = "v" + version
+		}
+		if semver.IsValid(version) && semver.Compare(version, "v1.16.1") < 0 {
+			t.Skipf("TestMultiNetwork requires terway version >= v1.16.1, current: %s", terwayVersion)
+			return
+		}
+	}
+
 	config := NewMultiNetworkConfig()
 
 	// Test scenarios: default mode (if enabled) + custom mode (if config available)
@@ -111,6 +124,13 @@ func TestMultiNetwork(t *testing.T) {
 
 // testMultiNetworkForNodeType tests multi-network functionality for a specific node type and configuration mode
 func testMultiNetworkForNodeType(t *testing.T, nodeType NodeType, mode string, config *MultiNetworkConfig) {
+	// Pre-check: skip Lingjun nodes as they are not supported yet
+	switch nodeType {
+	case NodeTypeLingjunSharedENI, NodeTypeLingjunExclusiveENI:
+		t.Skipf("Lingjun nodes are not supported yet")
+		return
+	}
+
 	testName := fmt.Sprintf("MultiNetwork/%s/%s", mode, nodeType)
 
 	feature := createMultiNetworkTestFeature(testName, nodeType, mode, config)
@@ -126,16 +146,6 @@ func createMultiNetworkTestFeature(testName string, nodeType NodeType, mode stri
 	return features.New(testName).
 		WithLabel("env", "multi-network").
 		Setup(func(ctx context.Context, t *testing.T, config *envconf.Config) context.Context {
-			// Check terway version >= v1.16.1
-			versionOK, err := CheckTerwayVersion(ctx, config, "v1.16.1")
-			if err != nil {
-				t.Fatalf("failed to check terway version: %v", err)
-			}
-			if !versionOK {
-				terwayVersion, _ := GetTerwayVersion(ctx, config)
-				t.Skipf("TestMultiNetwork requires terway version >= v1.16.1, current version: %s", terwayVersion)
-			}
-
 			// Check if required node type is available
 			nodeInfo, err := DiscoverNodeTypes(context.Background(), config.Client())
 			if err != nil {
@@ -147,11 +157,6 @@ func createMultiNetworkTestFeature(testName string, nodeType NodeType, mode stri
 				t.Skipf("No nodes of type %s available", nodeType)
 			}
 
-			switch nodeType {
-			case NodeTypeLingjunSharedENI, NodeTypeLingjunExclusiveENI:
-				t.Skipf("Lingjun nodes are not supported yet")
-			}
-
 			// Create primary PodNetworking (always use default config)
 			pn1 := NewPodNetworking(pnPrimary)
 			if nodeType == NodeTypeECSExclusiveENI || nodeType == NodeTypeLingjunExclusiveENI {

tests/pod_networking_test.go

@@ -218,20 +218,26 @@ func TestPodNetworking_NamespaceSelector(t *testing.T) {
 			// Create namespace WITH matching label
 			matchingNsObj := &corev1.Namespace{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:   matchingNs,
-					Labels: map[string]string{"network-type": "custom"},
+					Name: matchingNs,
+					Labels: map[string]string{
+						"network-type":              "custom",
+						"k8s.aliyun.com/terway-e2e": "true",
+					},
 				},
 			}
 			err = config.Client().Resources().Create(ctx, matchingNsObj)
 			if err != nil {
 				t.Fatalf("create matching namespace failed: %v", err)
 			}
 
-			// Create namespace WITHOUT matching label
+			// Create namespace WITHOUT matching label (for PodNetworking selector)
 			nonMatchingNsObj := &corev1.Namespace{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:   nonMatchingNs,
-					Labels: map[string]string{"network-type": "default"},
+					Name: nonMatchingNs,
+					Labels: map[string]string{
+						"network-type":              "default",
+						"k8s.aliyun.com/terway-e2e": "true",
+					},
 				},
 			}
 			err = config.Client().Resources().Create(ctx, nonMatchingNsObj)