Minor e2e fixes

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

Makefile

@@ -160,7 +160,7 @@ generate-go-conversions: $(CONVERSION_GEN) ## Generate conversions go code
 
 .PHONY: generate-e2e-templates
 generate-e2e-templates: $(KUSTOMIZE)
-ifneq ($(E2E_FLAVOR), vpc)
+ifeq ($(E2E_FLAVOR), md-remediation)
 	$(KUSTOMIZE) build $(E2E_TEMPLATES)/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(E2E_TEMPLATES)/cluster-template-md-remediation.yaml
 endif
 
@@ -172,7 +172,7 @@ generate-modules: ## Runs go mod to ensure modules are up to date
 images: docker-build
 
 set-flavor: 
-ifeq ($(E2E_FLAVOR), vpc)
+ifeq ($(E2E_FLAVOR), load-balancer)
 	 $(eval E2E_CONF_FILE=$(REPO_ROOT)/test/e2e/config/ibmcloud-e2e-vpc.yaml)
 else
 	 $(eval E2E_CONF_FILE=$(REPO_ROOT)/test/e2e/config/ibmcloud-e2e-powervs.yaml)
@@ -203,7 +203,7 @@ test: generate fmt vet setup-envtest $(GOTESTSUM) ## Run tests
 GINKGO_FOCUS ?= Workload cluster creation
 GINKGO_NODES ?= 3
 GINKGO_NOCOLOR ?= false
-E2E_FLAVOR ?= powervs
+E2E_FLAVOR ?= md-remediation
 JUNIT_FILE ?= junit.e2e_suite.1.xml
 GINKGO_ARGS ?= -v --trace --tags=e2e --focus=$(GINKGO_FOCUS) --nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) --output-dir="$(ARTIFACTS)" --junit-report="$(JUNIT_FILE)"
 ARTIFACTS ?= $(REPO_ROOT)/_artifacts

scripts/ci-e2e.sh

@@ -127,7 +127,7 @@ prerequisites_vpc(){
 
 main(){
 
-    [ "${E2E_FLAVOR}" = "vpc" ] && RESOURCE_TYPE="vpc-service"
+    [[ "${E2E_FLAVOR}" == "vpc" || "${E2E_FLAVOR}" == "load-balancer" ]] && RESOURCE_TYPE="vpc-service"
 
     # If BOSKOS_HOST is set then acquire an IBM Cloud resource from Boskos.
     if [ -n "${BOSKOS_HOST:-}" ]; then
@@ -161,7 +161,7 @@ main(){
         init_network_powervs
     fi
 
-    if [[ "${E2E_FLAVOR}" == "vpc" ]]; then
+    if [[ "${E2E_FLAVOR}" == "vpc" || "${E2E_FLAVOR}" == "load-balancer" ]]; then
         prerequisites_vpc
     fi
 

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

@@ -38,8 +38,8 @@ providers:
       files:
       - sourcePath: "${PWD}/metadata.yaml"
         targetName: "metadata.yaml"
-      - sourcePath: "${PWD}/templates/cluster-template.yaml"
-        targetName: "cluster-template-vpc.yaml"
+      - sourcePath: "${PWD}/templates/cluster-template-load-balancer.yaml"
+        targetName: "cluster-template-load-balancer.yaml"
 
 variables:
   KUBERNETES_VERSION: "${KUBERNETES_VERSION:-v1.25.2}"