updating logic of fetching version

Author: yash97

scripts/run-mixed-os-snat-kube-proxy-test.sh

@@ -9,7 +9,7 @@ INTEGRATION_TEST_DIR="$SCRIPT_DIR/../test/integration"
 
 # Defaults
 : "${AWS_DEFAULT_REGION:=us-west-2}"
-: "${CLUSTER_NAME:=cni-mixed-os-$RANDOM}"
+: "${CLUSTER_NAME:=cni-mixed-os-$(date +%s)}"
 : "${K8S_VERSION:=1.31}"
 : "${IP_FAMILY:=IPv4}"
 : "${NODES_PER_OS:=2}"
@@ -210,24 +210,24 @@ update_cni_image
 VPC_ID=$(get_vpc_id)
 echo "Using VPC: $VPC_ID"
 
-# # Run tests on each OS type
-# for os in "${OS_TYPES[@]}"; do
-#     run_tests_for_os "$os" || true
-# done
-
-# # Summary
-# echo ""
-# echo "========================================"
-# echo "Test Summary"
-# echo "========================================"
-# if [[ ${#FAILED_OS[@]} -eq 0 ]]; then
-#     echo "All OS types PASSED"
-# else
-#     echo "FAILED OS types: ${FAILED_OS[*]}"
-# fi
-
-# if [[ "$DEPROVISION" == true ]]; then
-#     delete_cluster
-# fi
-
-# [[ ${#FAILED_OS[@]} -eq 0 ]]
+# Run tests on each OS type
+for os in "${OS_TYPES[@]}"; do
+    run_tests_for_os "$os" || true
+done
+
+# Summary
+echo ""
+echo "========================================"
+echo "Test Summary"
+echo "========================================"
+if [[ ${#FAILED_OS[@]} -eq 0 ]]; then
+    echo "All OS types PASSED"
+else
+    echo "FAILED OS types: ${FAILED_OS[*]}"
+fi
+
+if [[ "$DEPROVISION" == true ]]; then
+    delete_cluster
+fi
+
+[[ ${#FAILED_OS[@]} -eq 0 ]]

test/integration/cni/snat_kube_proxy_test.go

@@ -11,10 +11,10 @@ package cni
 import (
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 	"time"
 
+	"github.com/Masterminds/semver/v3"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/resources/k8s/manifest"
 	"github.com/aws/amazon-vpc-cni-k8s/test/framework/utils"
 	"github.com/aws/amazon-vpc-cni-k8s/test/integration/common"
@@ -90,10 +90,9 @@ var _ = Describe("test SNAT with kube-proxy modes", func() {
 
 			ver, err := f.DiscoveryClient.ServerVersion()
 			Expect(err).ToNot(HaveOccurred())
-			minor, err := strconv.Atoi(ver.Minor)
+			semVer, err := semver.NewVersion(ver.String())
 			Expect(err).ToNot(HaveOccurred())
-
-			if minor <= 32 && mode == "nftables" {
+			if semVer.Minor() <= 32 && mode == "nftables" {
 				return
 			}