CCM E2E - K8s version check fix

Author: l-technicore

test/e2e/cloud-provider-oci/load_balancer.go

@@ -699,8 +699,8 @@ var _ = Describe("IpMode [Slow]", func() {
 	}
 	Context("[cloudprovider][ccm][lb][ipMode]", func() {
 		It("traffic should work from pods via load balancer", func() {
-			if sharedfw.CompareVersions(setupF.OkeClusterK8sVersion, "v1.30") < 0 {
-				Skip("Cluster K8s Version " + setupF.OkeClusterK8sVersion + " is less than v1.30, skipping test for Load Balancer ingress ipMode=\"Proxy\"")
+			if sharedfw.CompareVersions(f.OkeClusterK8sVersion, "v1.30") < 0 {
+				Skip("Cluster K8s Version " + f.OkeClusterK8sVersion + " is less than v1.30, skipping test for Load Balancer ingress ipMode=\"Proxy\"")
 			}
 			for _, test := range esippTestsArray {
 				By("Running test for: " + test.lbType)
@@ -790,8 +790,8 @@ var _ = Describe("ESIPP - IpMode Proxy [Slow]", func() {
 	}
 	Context("[cloudprovider][ccm][lb][esipp]", func() {
 		It("should preserve source IP of pod with ipMode Proxy", func() {
-			if sharedfw.CompareVersions(setupF.OkeClusterK8sVersion, "v1.30") < 0 {
-				Skip("Cluster K8s Version " + setupF.OkeClusterK8sVersion + " is less than v1.30, skipping test for ESIPP since it relies on ipMode=\"Proxy\"")
+			if sharedfw.CompareVersions(f.OkeClusterK8sVersion, "v1.30") < 0 {
+				Skip("Cluster K8s Version " + f.OkeClusterK8sVersion + " is less than v1.30, skipping test for ESIPP since it relies on ipMode=\"Proxy\"")
 			}
 			for _, test := range esippTestsArray {
 				By("Running test for: " + test.lbType)

test/e2e/framework/cloud_provider_framework.go

@@ -91,6 +91,8 @@ type CloudProviderFramework struct {
 	// Backend Nsg ocids test
 	BackendNsgOcids string
 	RunUhpE2E       bool
+
+	OkeClusterK8sVersion string
 }
 
 // NewDefaultFramework constructs a new e2e test CloudProviderFramework with default options.
@@ -294,6 +296,9 @@ func (f *CloudProviderFramework) BeforeEach() {
 		f.BlockStorageClient = f.createStorageClient()
 		f.ComputeClient = f.createComputeClient()
 	}
+
+	k8sVersion, _ := f.ClientSet.Discovery().ServerVersion()
+	f.OkeClusterK8sVersion = fmt.Sprintf("v%s", k8sVersion)
 }
 
 // AfterEach deletes the namespace(s).