Skip to content

Commit dc540c1

Browse files
committed
Added multi-resource YAML support
1 parent 29cd61e commit dc540c1

File tree

2 files changed

+24
-10
lines changed

2 files changed

+24
-10
lines changed

src/codeflare_sdk/cluster/cluster.py

+23-10
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
RayCluster,
3636
RayClusterStatus,
3737
)
38-
from kubernetes import client, config
38+
from kubernetes import client, config, utils
3939
import yaml
4040
import os
4141
import requests
@@ -165,15 +165,28 @@ def up(self):
165165
try:
166166
config_check()
167167
api_instance = client.CustomObjectsApi(api_config_handler())
168-
with open(self.app_wrapper_yaml) as f:
169-
aw = yaml.load(f, Loader=yaml.FullLoader)
170-
api_instance.create_namespaced_custom_object(
171-
group="workload.codeflare.dev",
172-
version="v1beta1",
173-
namespace=namespace,
174-
plural="appwrappers",
175-
body=aw,
176-
)
168+
if self.config.mcad:
169+
with open(self.app_wrapper_yaml) as f:
170+
aw = yaml.load(f, Loader=yaml.FullLoader)
171+
api_instance.create_namespaced_custom_object(
172+
group="workload.codeflare.dev",
173+
version="v1beta1",
174+
namespace=namespace,
175+
plural="appwrappers",
176+
body=aw,
177+
)
178+
else:
179+
with open(self.app_wrapper_yaml) as f:
180+
yamls = yaml.load_all(f, Loader=yaml.FullLoader)
181+
for resource in yamls:
182+
print(resource["kind"])
183+
# api_instance.create_namespaced_custom_object(
184+
# group="ray.io",
185+
# version="v1alpha1",
186+
# namespace=namespace,
187+
# plural="rayclusters",
188+
# body=aw,
189+
# )
177190
except Exception as e: # pragma: no cover
178191
return _kube_api_error_handling(e)
179192

src/codeflare_sdk/utils/generate_yaml.py

+1
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ def write_components(user_yaml, output_file_name):
375375
with open(output_file_name, "a") as outfile:
376376
for component in components:
377377
if "generictemplate" in component:
378+
outfile.write("---\n")
378379
yaml.dump(
379380
component["generictemplate"], outfile, default_flow_style=False
380381
)

0 commit comments

Comments
 (0)