From 5fb75bc2bfae563d2f5c146053a0736763033b92 Mon Sep 17 00:00:00 2001
From: Suraj Deshmukh <suraj.deshmukh@microsoft.com>
Date: Fri, 1 Mar 2024 06:38:08 -0800
Subject: [PATCH] test-e2e: Make KBS opt-in for e2e tests

This change make KBS opt-in for e2e tests. For
Azure provisioner opt-in for KBS installation.

Signed-off-by: Suraj Deshmukh <suraj.deshmukh@microsoft.com>
---
 test/e2e/main_test.go                             | 6 +++---
 test/provisioner/azure/provision_azure.properties | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/e2e/main_test.go b/test/e2e/main_test.go
index d2d77ef88..781065f69 100644
--- a/test/e2e/main_test.go
+++ b/test/e2e/main_test.go
@@ -96,9 +96,9 @@ func TestMain(m *testing.M) {
 	}
 
 	// The DEPLOY_KBS is exported then provisioner will install kbs before installing CAA
-	shouldDeployKbs := true
-	if os.Getenv("DEPLOY_KBS") != "yes" {
-		shouldDeployKbs = false
+	shouldDeployKbs := false
+	if os.Getenv("DEPLOY_KBS") == "true" {
+		shouldDeployKbs = true
 	}
 
 	if !shouldProvisionCluster {
diff --git a/test/provisioner/azure/provision_azure.properties b/test/provisioner/azure/provision_azure.properties
index 5e8bf51e0..f3b64213a 100644
--- a/test/provisioner/azure/provision_azure.properties
+++ b/test/provisioner/azure/provision_azure.properties
@@ -13,5 +13,8 @@ SSH_USERNAME=""
 AZURE_CLI_AUTH="false"
 IS_CI_MANAGED_CLUSTER="false"
 IS_SELF_MANAGED_CLUSTER="false"
+
+# KBS configs
 KBS_IMAGE="${KBS_IMAGE}"
 KBS_IMAGE_TAG="${KBS_IMAGE_TAG}"
+DEPLOY_KBS="true"