Changed pre-deployment to Go command from bash script

Signed-off-by: aryans1204 <arshar1204@gmail.com>

Author: aryans1204

.gitignore

@@ -15,6 +15,7 @@ pkg/workload/openwhisk/*.zip
 tools/*/__pycache__
 tools/trace_synthesizer/*.csv
 tools/trace_synthesizer/*/*.csv
+workloads/container/yamls/
 
 ### CMake ###
 CMakeLists.txt.user
@@ -209,4 +210,4 @@ tools/plotter/test-out
 *.swp
 
 data/traces/azure_*
-data/traces/day*
+data/traces/day*

docs/generate_deploy_info_docs.md

@@ -1,11 +1,11 @@
 # Deploy Info JSON
 
-## The `deploy_info.json` file in the `yamls.tar.gz`  is used to identify the relative file paths for the Knative YAML manifests for deploying vSwarm functions. It is generated using `generate_deploy_info.py` Python script, also present under `yamls.tar.gz`, which outputs a JSON that embeds the yaml-location and pre-deployment commands for every vSwarm function. zit also contains the path of YAML files needed as part of the pre-deployment commands to run certain vSwarm benchmarks, for example the `online-shop-database` which requires to be deployed before running `cartservice` benchmark.
+## The `deploy_info.json` file in the `vSwarm_deploy_metadata.tar.gz`  is used to identify the relative file paths for the Knative YAML manifests for deploying vSwarm functions. It is generated using `workloads/container/generate_deploy_info.py` Python script, which outputs a JSON that embeds the yaml-location and pre-deployment commands for every vSwarm function. It also contains the path of YAML files needed as part of the pre-deployment commands to run certain vSwarm benchmarks, for example the `online-shop-database` which requires to be deployed before running `cartservice` benchmark.
 
-## While the `deploy_info.json` file ships with the `yamls.tar.gz`, In order to regenerate the `deploy_info.json` run:
+While the `deploy_info.json` file ships with the `vSwarm_deploy_metadata.tar.gz`, In order to regenerate the `deploy_info.json` run from the root of this repository:
 ```console
 tar -xzvf workloads/container/vSwarm_deploy_metadata.tar.gz -C workloads/container
-cd workloads/container/yamls/
+cd workloads/container/
 python3 generate_deploy_info.py
 ```
 
@@ -15,7 +15,18 @@ The `deploy_info.json` has the following schema:
     vswarm-function-name:
         {
             YamlLocation: /path/to/yaml
-            PredeploymentPath: [/path/to/predeployment/yaml]
+            PredeploymentPath: [/path/to/predeployment-database/yaml]
         }
 }
+```
+
+## The `PredeploymentPath` is the path to the YAML file, which is applied via `kubectl apply -f`, before creating the service under `YamlLocation`. This pre-deployment step is required in some vSwarm benchmarks, like `cartservice` which depends on a separate service `online-shop-database` before it can be started.
+
+Similarly, the `workloads/container/generate_all_yamls.py` is a wrapper script that calls the `generate-yamls.py` script for each vSwarm benchmark in the `vSwarm_deploy_metadata.tar.gz`. The `generate-yamls.py` Python script parametrizes the YAML script for the benchmark for different configurations, and creates YAML files accordingly. 
+
+While the YAMLs are pre-generated inside the `vSwarm_deploy_metadata.tar.gz` tarball, to regenerate the YAMLs, run this from the root of this repository:
+```console
+tar -xzvf workloads/container/vSwarm_deploy_metadata.tar.gz -C workloads/container
+cd workloads/container
+python3 generate_all_yamls.py
 ```

go.mod

@@ -33,6 +33,7 @@ require (
 	github.com/campoy/embedmd v1.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/davidmz/go-pageant v1.0.2 // indirect
+	github.com/go-cmd/cmd v1.4.3 // indirect
 	github.com/go-fonts/liberation v0.3.3 // indirect
 	github.com/go-latex/latex v0.0.0-20240709081214-31cef3c7570e // indirect
 	github.com/go-logr/logr v1.4.2 // indirect

go.sum

@@ -18,6 +18,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davidmz/go-pageant v1.0.2 h1:bPblRCh5jGU+Uptpz6LgMZGD5hJoOt7otgT454WvHn0=
 github.com/davidmz/go-pageant v1.0.2/go.mod h1:P2EDDnMqIwG5Rrp05dTRITj9z2zpGcD9efWSkTNKLIE=
+github.com/go-cmd/cmd v1.4.3 h1:6y3G+3UqPerXvPcXvj+5QNPHT02BUw7p6PsqRxLNA7Y=
+github.com/go-cmd/cmd v1.4.3/go.mod h1:u3hxg/ry+D5kwh8WvUkHLAMe2zQCaXd00t35WfQaOFk=
 github.com/go-fonts/dejavu v0.3.4 h1:Qqyx9IOs5CQFxyWTdvddeWzrX0VNwUAvbmAzL0fpjbc=
 github.com/go-fonts/dejavu v0.3.4/go.mod h1:D1z0DglIz+lmpeNYMYlxW4r22IhcdOYnt+R3PShU/Kg=
 github.com/go-fonts/latin-modern v0.3.3 h1:g2xNgI8yzdNzIVm+qvbMryB6yGPe0pSMss8QT3QwlJ0=

pkg/driver/deployment/knative.go

@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"sync"
 
+	"github.com/go-cmd/cmd"
 	log "github.com/sirupsen/logrus"
 	"github.com/vhive-serverless/loader/pkg/common"
 	"github.com/vhive-serverless/loader/pkg/config"
@@ -106,13 +107,12 @@ func knativeDeploySingleFunction(function *common.Function, yamlPath string, isP
 		// second, then round to an integer as that is what the knative config expects
 	}
 	for _, path := range function.PredeploymentPath {
-		out := exec.Command(
-			"bash",
-			"./pkg/driver/deployment/predeploy_vswarm.sh",
-			path,
-		)
-		response, _ := out.CombinedOutput()
-		log.Debug("Predeployment command response is", string(response))
+		envCmd := cmd.NewCmd("kubectl", "apply", "-f", path)
+		status := <-envCmd.Start()
+
+		for _, line := range status.Stdout {
+			fmt.Println("Predeployment command response is" + line)
+		}
 	}
 	cmd := exec.Command(
 		"bash",

pkg/driver/deployment/predeploy_vswarm.sh

@@ -15,6 +15,6 @@
     # Run the python script
     subprocess.run(['python3', 'generate-yamls.py'])
     print(f"Generated yaml files for {directory}")
-    os.chdir(current_dir)
+    os.chdir(yaml_dir)
 
 print("Generated all yaml files")

workloads/container/.gitattributes

@@ -12,15 +12,15 @@
 
 # Get the current working directory
 current_dir = os.getcwd()+"/yamls"
-
+print(current_dir)
 # Get the list of directories
-directories = [d for d in os.listdir(current_dir) if os.path.isdir(d)]
-
+directories = [d for d in os.listdir(current_dir) if d != "deploy_info.json"]
+print(directories)
 predeployment_required = ["hotel-app", "image-rotate-python", "image-rotate-go", "video-processing", "video-analytics-standalone", "online-shop"]
 
 deploy_info = {}
 for directory in directories:
-    os.chdir(directory)
+    os.chdir(os.path.join(current_dir, directory))
     # Get the list of yaml files
     yaml_files = glob.glob("*.yaml")
     function_name = {}

workloads/container/generate_all_yamls.py

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3660ccf88e8718998efdea6616ed6cd588a2da0f412441e0d4e66ed87a4a3da5
-size 24157
+oid sha256:eafd72174b1e5d5632bf4b0de8652b16823207ffb4cabdc31ce97d210889cf99
+size 22901