workflow and sub workflow changes

krkn-chaos · Jan 9, 2024 · 49dca6d · 49dca6d
1 parent add714f
commit 49dca6d
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 17 deletions.
diff --git a/kraken/arcaflow_plugin/arcaflow_plugin.py b/kraken/arcaflow_plugin/arcaflow_plugin.py
@@ -96,9 +96,9 @@ def set_arca_kubeconfig(engine_args: arcaflow.EngineArgs, kubeconfig_path: str):
 
     with open(engine_args.config, "r") as stream:
         config_file = yaml.safe_load(stream)
-    if config_file["deployer"]["type"] == "kubernetes":
-        kube_connection = set_kubernetes_deployer_auth(config_file["deployer"]["connection"], context_auth)
-        config_file["deployer"]["connection"]=kube_connection
+    if config_file["deployers"]["image"]["deployer_name"] == "kubernetes":
+        kube_connection = set_kubernetes_deployer_auth(config_file["deployers"]["image"]["connection"], context_auth)
+        config_file["deployers"]["image"]["connection"]=kube_connection
         with open(engine_args.config, "w") as stream:
             yaml.safe_dump(config_file, stream,explicit_start=True, width=4096)
 

diff --git a/scenarios/arcaflow/cpu-hog/config.yaml b/scenarios/arcaflow/cpu-hog/config.yaml
@@ -2,7 +2,7 @@
 deployers:
   image:
     connection: {}
-    type: kubernetes
+    deployer_name: kubernetes
 log:
   level: debug
 logged_outputs:

diff --git a/scenarios/arcaflow/cpu-hog/sub-workflow.yaml b/scenarios/arcaflow/cpu-hog/sub-workflow.yaml
@@ -1,4 +1,4 @@
-version: v0.1.0
+version: v0.2.0
 input:
   root: RootObject
   objects:
@@ -61,11 +61,15 @@ input:
 
 steps:
   kubeconfig:
-    plugin: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+      deployment_type: image
     input:
       kubeconfig: !expr $.input.kubeconfig
   stressng:
-    plugin: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+      deployment_type: image
     step: workload
     input:
       cleanup: "true"
@@ -77,7 +81,7 @@ steps:
             cpu_method: !expr $.input.cpu_method
             cpu_load: !expr $.input.cpu_load_percentage
     deploy:
-      type: kubernetes
+      deployer_name: kubernetes
       connection: !expr $.steps.kubeconfig.outputs.success.connection
       pod:
         metadata:

diff --git a/scenarios/arcaflow/cpu-hog/workflow.yaml b/scenarios/arcaflow/cpu-hog/workflow.yaml
@@ -1,4 +1,4 @@
-version: v0.1.0
+version: v0.2.0
 input:
   root: RootObject
   objects:

diff --git a/scenarios/arcaflow/io-hog/config.yaml b/scenarios/arcaflow/io-hog/config.yaml
@@ -1,7 +1,7 @@
 deployers:
   image:
     connection: {}
-    type: kubernetes
+    deployer_name: kubernetes
 log:
   level: debug
 logged_outputs:

diff --git a/scenarios/arcaflow/io-hog/sub-workflow.yaml b/scenarios/arcaflow/io-hog/sub-workflow.yaml
@@ -96,11 +96,15 @@ input:
 
 steps:
   kubeconfig:
-    plugin: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+      deployment_type: image
     input:
       kubeconfig: !expr $.input.kubeconfig
   stressng:
-    plugin: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+      deployment_type: image
     step: workload
     input:
       cleanup: "true"
@@ -114,7 +118,7 @@ steps:
             hdd_write_size: !expr $.input.io_block_size
 
     deploy:
-      type: kubernetes
+      deployer_name: kubernetes
       connection: !expr $.steps.kubeconfig.outputs.success.connection
       pod:
         metadata:

diff --git a/scenarios/arcaflow/memory-hog/config.yaml b/scenarios/arcaflow/memory-hog/config.yaml
@@ -2,7 +2,7 @@
 deployers:
   image:
     connection: {}
-    type: kubernetes
+    deployer_name: kubernetes
 log:
   level: debug
 logged_outputs:

diff --git a/scenarios/arcaflow/memory-hog/sub-workflow.yaml b/scenarios/arcaflow/memory-hog/sub-workflow.yaml
@@ -53,11 +53,15 @@ input:
 
 steps:
   kubeconfig:
-    plugin: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-kubeconfig:0.2.0
+      deployment_type: image
     input:
       kubeconfig: !expr $.input.kubeconfig
   stressng:
-    plugin: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+    plugin: 
+      src: quay.io/arcalot/arcaflow-plugin-stressng:0.5.0
+      deployment_type: image
     step: workload
     input:
       cleanup: "true"
@@ -68,7 +72,7 @@ steps:
             vm: !expr $.input.vm_workers
             vm_bytes: !expr $.input.vm_bytes
     deploy:
-      type: kubernetes
+      deployer_name: kubernetes
       connection: !expr $.steps.kubeconfig.outputs.success.connection
       pod:
         metadata: