Skip to content

Commit 415b055

Browse files
authored
Added conditions before deleting template elements (#244)
* Added conditions before deleting template elements * Updated conditions for generic items
1 parent cf0f990 commit 415b055

File tree

1 file changed

+55
-20
lines changed

1 file changed

+55
-20
lines changed

src/codeflare_sdk/utils/generate_yaml.py

Lines changed: 55 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -267,26 +267,61 @@ def enable_local_interactive(resources, cluster_name, namespace):
267267

268268

269269
def disable_raycluster_tls(resources):
270-
del resources["GenericItems"][0]["generictemplate"]["spec"]["headGroupSpec"][
271-
"template"
272-
]["spec"]["volumes"]
273-
del resources["GenericItems"][0]["generictemplate"]["spec"]["headGroupSpec"][
274-
"template"
275-
]["spec"]["containers"][0]["volumeMounts"]
276-
del resources["GenericItems"][0]["generictemplate"]["spec"]["headGroupSpec"][
277-
"template"
278-
]["spec"]["initContainers"]
279-
del resources["GenericItems"][0]["generictemplate"]["spec"]["workerGroupSpecs"][0][
280-
"template"
281-
]["spec"]["volumes"]
282-
del resources["GenericItems"][0]["generictemplate"]["spec"]["workerGroupSpecs"][0][
283-
"template"
284-
]["spec"]["containers"][0]["volumeMounts"]
285-
del resources["GenericItems"][0]["generictemplate"]["spec"]["workerGroupSpecs"][0][
286-
"template"
287-
]["spec"]["initContainers"][1]
288-
del resources["GenericItems"][3] # rayclient route
289-
del resources["GenericItems"][2] # ca-secret
270+
generic_template_spec = resources["GenericItems"][0]["generictemplate"]["spec"]
271+
272+
if "volumes" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
273+
del generic_template_spec["headGroupSpec"]["template"]["spec"]["volumes"]
274+
275+
if (
276+
"volumeMounts"
277+
in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0]
278+
):
279+
del generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0][
280+
"volumeMounts"
281+
]
282+
283+
if "initContainers" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
284+
del generic_template_spec["headGroupSpec"]["template"]["spec"]["initContainers"]
285+
286+
if "volumes" in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]:
287+
del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]["volumes"]
288+
289+
if (
290+
"volumeMounts"
291+
in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
292+
"containers"
293+
][0]
294+
):
295+
del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
296+
"containers"
297+
][0]["volumeMounts"]
298+
299+
for i in range(
300+
len(
301+
generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
302+
"initContainers"
303+
]
304+
)
305+
):
306+
if (
307+
generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
308+
"initContainers"
309+
][i]["name"]
310+
== "create-cert"
311+
):
312+
del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
313+
"initContainers"
314+
][i]
315+
316+
updated_items = []
317+
for i in resources["GenericItems"][:]:
318+
if "rayclient-deployment-name" in i["generictemplate"]["metadata"]["name"]:
319+
continue
320+
if "ca-secret-deployment-name" in i["generictemplate"]["metadata"]["name"]:
321+
continue
322+
updated_items.append(i)
323+
324+
resources["GenericItems"] = updated_items
290325

291326

292327
def write_user_appwrapper(user_yaml, output_file_name):

0 commit comments

Comments
 (0)