Minor e2e related fixes (#1057)

Signed-off-by: Prajyot-Parab <[email protected]>

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

scripts/ci-e2e.sh

@@ -114,8 +114,8 @@ prerequisites_powervs(){
 
 prerequisites_vpc(){
     # Assigning VPC variables
-    export IBMVPC_REGION=${BOSKOS_REGION:-"jp-tok"}
-    export IBMVPC_ZONE="${BOSKOS_REGION:-}-1"
+    export IBMVPC_REGION=${BOSKOS_REGION:-"jp-osa"}
+    export IBMVPC_ZONE="${IBMVPC_REGION}-1"
     export IBMVPC_RESOURCEGROUP=${BOSKOS_RESOURCE_GROUP:-"fa5405a58226402f9a5818cb9b8a5a8a"}
     export IBMVPC_NAME=${BOSKOS_RESOURCE_NAME:-"capi-vpc-e2e"}
     export IBMVPC_IMAGE_NAME=${IBMVPC_IMAGE_NAME:-"capibm-vpc-ubuntu-2004-kube-v1-25-2"}

test/e2e/config/ibmcloud-e2e-vpc.yaml

@@ -61,7 +61,7 @@ variables:
 intervals:
   default/wait-controllers: ["3m", "10s"]
   default/wait-cluster: ["20m", "10s"]
-  default/wait-control-plane: ["60m", "10s"]
+  default/wait-control-plane: ["30m", "10s"]
   default/wait-worker-nodes: ["30m", "10s"]
   default/wait-delete-cluster: ["20m", "10s"]
   default/wait-machine-upgrade: ["50m", "10s"]

test/e2e/data/cni/calico/calico.yaml

@@ -4416,7 +4416,7 @@ metadata:
 
 # This manifest creates a Pod Disruption Budget for Controller to allow K8s Cluster Autoscaler to evict
 
-apiVersion: policy/v1beta1
+apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
   name: calico-kube-controllers