Add an option to use custom kind node image in e2e flow

Author: Amulyam24

scripts/ci-e2e.sh

@@ -181,6 +181,7 @@ main(){
     export EXP_CLUSTER_RESOURCE_SET=true
     export IBMACCOUNT_ID=${IBMACCOUNT_ID:-"7cfbd5381a434af7a09289e795840d4e"}
     export BASE64_API_KEY=$(tr -d '\n' <<<"$IBMCLOUD_API_KEY" | base64)
+    export CUSTOM_KIND_NODE_IMAGE=${CUSTOM_KIND_NODE_IMAGE:-}
     # Setting controller loglevel to allow debug logs from the VPC/PowerVS client
     export LOGLEVEL=5
 

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

@@ -45,6 +45,7 @@ variables:
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.33.1}"
   # Below variable should be set based on the targeted environment
   SERVICE_ENDPOINT: "${SERVICE_ENDPOINT:-}"
+  CUSTOM_KIND_NODE_IMAGE: ${CUSTOM_KIND_NODE_IMAGE:-}""
   # Cluster Addons
   CNI: "${PWD}/test/e2e/data/cni/calico/calico.yaml"
   IP_FAMILY: "IPv4"

test/e2e/suite_test.go

@@ -44,9 +44,10 @@ import (
 )
 
 const (
-	KubernetesVersion = "KUBERNETES_VERSION"
-	CNIPath           = "CNI"
-	CNIResources      = "CNI_RESOURCES"
+	KubernetesVersion   = "KUBERNETES_VERSION"
+	CNIPath             = "CNI"
+	CNIResources        = "CNI_RESOURCES"
+	CustomKindNodeImage = "CUSTOM_KIND_NODE_IMAGE"
 )
 
 // Test suite flags.
@@ -192,13 +193,24 @@ func createClusterctlLocalRepository(config *clusterctl.E2EConfig, repositoryFol
 }
 
 func setupBootstrapCluster(config *clusterctl.E2EConfig, scheme *runtime.Scheme, useExistingCluster bool) (bootstrap.ClusterProvider, framework.ClusterProxy) {
-	var clusterProvider bootstrap.ClusterProvider
-	kubeconfigPath := ""
+	var (
+		clusterProvider bootstrap.ClusterProvider
+		kubeconfigPath  string
+	)
+	input := bootstrap.CreateKindBootstrapClusterAndLoadImagesInput{
+		Name:   config.ManagementClusterName,
+		Images: config.Images,
+	}
+
+	customImage := config.GetVariableOrEmpty(CustomKindNodeImage)
+	if customImage != "" {
+		input.CustomNodeImage = customImage
+	} else {
+		input.KubernetesVersion = e2eConfig.MustGetVariable(KubernetesVersion)
+	}
+
 	if !useExistingCluster {
-		clusterProvider = bootstrap.CreateKindBootstrapClusterAndLoadImages(context.TODO(), bootstrap.CreateKindBootstrapClusterAndLoadImagesInput{
-			Name:   config.ManagementClusterName,
-			Images: config.Images,
-		})
+		clusterProvider = bootstrap.CreateKindBootstrapClusterAndLoadImages(context.TODO(), input)
 		Expect(clusterProvider).ToNot(BeNil(), "Failed to create a bootstrap cluster")
 
 		kubeconfigPath = clusterProvider.GetKubeconfigPath()