@@ -48,6 +48,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
4848(in the cluster sub-module) for AppWrapper generation.
4949"""
5050
51+ import typing
5152import yaml
5253import sys
5354import os
@@ -497,35 +498,38 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
497498 ][0].get("command")[2] = command
498499
499500
501+ def del_from_list_by_name(l: list, target: typing.List[str]) -> list:
502+ return [x for x in l if x["name"] not in target]
503+
504+
500505def disable_raycluster_tls(resources):
501506 generic_template_spec = resources["GenericItems"][0]["generictemplate"]["spec"]
502507
503- if "volumes" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
504- del generic_template_spec["headGroupSpec"]["template"]["spec"]["volumes"]
508+ headGroupTemplateSpec = generic_template_spec["headGroupSpec"]["template"]["spec"]
509+ headGroupTemplateSpec["volumes"] = del_from_list_by_name(
510+ headGroupTemplateSpec.get("volumes", []),
511+ ["ca-vol", "server-cert"],
512+ )
505513
506- if (
507- "volumeMounts"
508- in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0]
509- ):
510- del generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0][
511- "volumeMounts"
512- ]
514+ c: dict
515+ for c in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"]:
516+ c["volumeMounts"] = del_from_list_by_name(
517+ c.get("volumeMounts", []), ["ca-vol", "server-cert"]
518+ )
513519
514520 if "initContainers" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
515521 del generic_template_spec["headGroupSpec"]["template"]["spec"]["initContainers"]
516522
517- if "volumes" in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]:
518- del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]["volumes"]
519-
520- if (
521- "volumeMounts"
522- in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
523- "containers"
524- ][0]
525- ):
526- del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
527- "containers"
528- ][0]["volumeMounts"]
523+ for workerGroup in generic_template_spec.get("workerGroupSpecs", []):
524+ workerGroupSpec = workerGroup["template"]["spec"]
525+ workerGroupSpec["volumes"] = del_from_list_by_name(
526+ workerGroupSpec.get("volumes", []),
527+ ["ca-vol", "server-cert"],
528+ )
529+ for c in workerGroup["template"]["spec"].get("containers", []):
530+ c["volumeMounts"] = del_from_list_by_name(
531+ c.get("volumeMounts", []), ["ca-vol", "server-cert"]
532+ )
529533
530534 del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
531535 "initContainers"
@@ -765,6 +769,19 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
765769< section >
766770< h2 class ="section-title " id ="header-functions "> Functions</ h2 >
767771< dl >
772+ < dt id ="codeflare_sdk.utils.generate_yaml.del_from_list_by_name "> < code class ="name flex ">
773+ < span > def < span class ="ident "> del_from_list_by_name</ span > </ span > (< span > l: list, target: List[str]) ‑> list</ span >
774+ </ code > </ dt >
775+ < dd >
776+ < div class ="desc "> </ div >
777+ < details class ="source ">
778+ < summary >
779+ < span > Expand source code</ span >
780+ </ summary >
781+ < pre > < code class ="python "> def del_from_list_by_name(l: list, target: typing.List[str]) -> list:
782+ return [x for x in l if x["name"] not in target]</ code > </ pre >
783+ </ details >
784+ </ dd >
768785< dt id ="codeflare_sdk.utils.generate_yaml.delete_route_or_ingress "> < code class ="name flex ">
769786< span > def < span class ="ident "> delete_route_or_ingress</ span > </ span > (< span > resources)</ span >
770787</ code > </ dt >
@@ -806,32 +823,31 @@ <h2 class="section-title" id="header-functions">Functions</h2>
806823< pre > < code class ="python "> def disable_raycluster_tls(resources):
807824 generic_template_spec = resources["GenericItems"][0]["generictemplate"]["spec"]
808825
809- if "volumes" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
810- del generic_template_spec["headGroupSpec"]["template"]["spec"]["volumes"]
826+ headGroupTemplateSpec = generic_template_spec["headGroupSpec"]["template"]["spec"]
827+ headGroupTemplateSpec["volumes"] = del_from_list_by_name(
828+ headGroupTemplateSpec.get("volumes", []),
829+ ["ca-vol", "server-cert"],
830+ )
811831
812- if (
813- "volumeMounts"
814- in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0]
815- ):
816- del generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"][0][
817- "volumeMounts"
818- ]
832+ c: dict
833+ for c in generic_template_spec["headGroupSpec"]["template"]["spec"]["containers"]:
834+ c["volumeMounts"] = del_from_list_by_name(
835+ c.get("volumeMounts", []), ["ca-vol", "server-cert"]
836+ )
819837
820838 if "initContainers" in generic_template_spec["headGroupSpec"]["template"]["spec"]:
821839 del generic_template_spec["headGroupSpec"]["template"]["spec"]["initContainers"]
822840
823- if "volumes" in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]:
824- del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"]["volumes"]
825-
826- if (
827- "volumeMounts"
828- in generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
829- "containers"
830- ][0]
831- ):
832- del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
833- "containers"
834- ][0]["volumeMounts"]
841+ for workerGroup in generic_template_spec.get("workerGroupSpecs", []):
842+ workerGroupSpec = workerGroup["template"]["spec"]
843+ workerGroupSpec["volumes"] = del_from_list_by_name(
844+ workerGroupSpec.get("volumes", []),
845+ ["ca-vol", "server-cert"],
846+ )
847+ for c in workerGroup["template"]["spec"].get("containers", []):
848+ c["volumeMounts"] = del_from_list_by_name(
849+ c.get("volumeMounts", []), ["ca-vol", "server-cert"]
850+ )
835851
836852 del generic_template_spec["workerGroupSpecs"][0]["template"]["spec"][
837853 "initContainers"
@@ -1699,6 +1715,7 @@ <h1>Index</h1>
16991715</ li >
17001716< li > < h3 > < a href ="#header-functions "> Functions</ a > </ h3 >
17011717< ul class ="">
1718+ < li > < code > < a title ="codeflare_sdk.utils.generate_yaml.del_from_list_by_name " href ="#codeflare_sdk.utils.generate_yaml.del_from_list_by_name "> del_from_list_by_name</ a > </ code > </ li >
17021719< li > < code > < a title ="codeflare_sdk.utils.generate_yaml.delete_route_or_ingress " href ="#codeflare_sdk.utils.generate_yaml.delete_route_or_ingress "> delete_route_or_ingress</ a > </ code > </ li >
17031720< li > < code > < a title ="codeflare_sdk.utils.generate_yaml.disable_raycluster_tls " href ="#codeflare_sdk.utils.generate_yaml.disable_raycluster_tls "> disable_raycluster_tls</ a > </ code > </ li >
17041721< li > < code > < a title ="codeflare_sdk.utils.generate_yaml.enable_local_interactive " href ="#codeflare_sdk.utils.generate_yaml.enable_local_interactive "> enable_local_interactive</ a > </ code > </ li >
0 commit comments