Revert "test: add condition for kbs deploy in provisioner to align wi…

…th e2e test" This reverts commit 4a6e081.
confidential-containers · Apr 15, 2024 · 06c739d · 06c739d
1 parent 6c87f31
commit 06c739d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 24 deletions.
diff --git a/src/cloud-api-adaptor/test/tools/README.md b/src/cloud-api-adaptor/test/tools/README.md
@@ -27,7 +27,6 @@ export LOG_LEVEL=${LOG_LEVEL}
 export CLOUD_PROVIDER=${CLOUD_PROVIDER}
 export TEST_PROVISION_FILE=${PROPERTIES_FILE_PATH}
 export TEST_PROVISION="yes"
-export DEPLOY_KBS="true"
 export INSTALL_DIR="../../install"
 ./caa-provisioner-cli -action=${ACTION}
 ```

diff --git a/src/cloud-api-adaptor/test/tools/provisioner-cli/main.go b/src/cloud-api-adaptor/test/tools/provisioner-cli/main.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"flag"
 	"os"
-	"strings"
 
 	pv "github.com/confidential-containers/cloud-api-adaptor/src/cloud-api-adaptor/test/provisioner"
 	log "github.com/sirupsen/logrus"
@@ -37,7 +36,6 @@ func main() {
 	cloudProvider := os.Getenv("CLOUD_PROVIDER")
 	provisionPropsFile := os.Getenv("TEST_PROVISION_FILE")
 	podvmImage := os.Getenv("TEST_PODVM_IMAGE")
-	shouldDeployKbs := os.Getenv("DEPLOY_KBS")
 
 	installDirectory := os.Getenv("INSTALL_DIR")
 	// If not set assume we are in the test/tools directory
@@ -66,6 +64,9 @@ func main() {
 
 	if *action == "provision" {
 		props := provisioner.GetProperties(context.TODO(), cfg)
+		if props["KBS_IMAGE"] == "" || props["KBS_IMAGE_TAG"] == "" {
+			log.Fatal("kbs image not provided")
+		}
 
 		log.Info("Creating VPC...")
 		if err := provisioner.CreateVPC(context.TODO(), cfg); err != nil {
@@ -87,31 +88,27 @@ func main() {
 			}
 		}
 
-		if strings.EqualFold(shouldDeployKbs, "true") || strings.EqualFold(shouldDeployKbs, "yes") {
-			log.Info("Deploying kbs")
-			if props["KBS_IMAGE"] == "" || props["KBS_IMAGE_TAG"] == "" {
-				log.Fatal("kbs image not provided")
-			}
-			keyBrokerService, err := pv.NewKeyBrokerService(props["CLUSTER_NAME"])
-			if err != nil {
-				log.Fatal(err)
-			}
+		log.Info("Deploying kbs")
+		keyBrokerService, err := pv.NewKeyBrokerService(props["CLUSTER_NAME"])
+		if err != nil {
+			log.Fatal(err)
+		}
 
-			if err = keyBrokerService.Deploy(context.TODO(), cfg, props); err != nil {
-				log.Fatal(err)
-			}
+		if err = keyBrokerService.Deploy(context.TODO(), cfg, props); err != nil {
+			log.Fatal(err)
+		}
 
-			var kbsPodIP string
-			kbsPodIP, err = keyBrokerService.GetKbsPodIP(context.TODO(), cfg)
-			if err != nil {
-				log.Fatal(err)
-			}
+		var kbsPodIP string
+		kbsPodIP, err = keyBrokerService.GetKbsPodIP(context.TODO(), cfg)
+		if err != nil {
+			log.Fatal(err)
+		}
 
-			kbsparams := "cc_kbc::http://" + kbsPodIP + ":8080"
-			log.Infof("KBS PARAMS: %s", kbsparams)
+		kbsparams := "cc_kbc::http://" + kbsPodIP + ":8080"
+		log.Infof("KBS PARAMS: %s", kbsparams)
 
-			props["AA_KBC_PARAMS"] = kbsparams
-		}
+		props = provisioner.GetProperties(context.TODO(), cfg)
+		props["AA_KBC_PARAMS"] = kbsparams
 
 		cloudAPIAdaptor, err := pv.NewCloudAPIAdaptor(cloudProvider, installDirectory)
 		if err != nil {