@@ -1003,106 +1003,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
10031003 "orderedinstance" : "m4.xlarge_g4dn.xlarge" ,
10041004 "kueue.x-k8s.io/queue-name" : "team-a-queue" ,
10051005 },
1006- "managedFields" : [
1007- {
1008- "apiVersion" : "ray.io/v1" ,
1009- "fieldsType" : "FieldsV1" ,
1010- "fieldsV1" : {
1011- "f:metadata" : {
1012- "f:labels" : {
1013- "." : {},
1014- "f:appwrapper.mcad.ibm.com" : {},
1015- "f:controller-tools.k8s.io" : {},
1016- "f:resourceName" : {},
1017- "f:workload.codeflare.dev/appwrapper" : {},
1018- },
1019- "f:ownerReferences" : {
1020- "." : {},
1021- 'k:{"uid":"a29b1a7a-0992-4860-a8d5-a689a751a3e8"}' : {},
1022- },
1023- },
1024- "f:spec" : {
1025- "." : {},
1026- "f:autoscalerOptions" : {
1027- "." : {},
1028- "f:idleTimeoutSeconds" : {},
1029- "f:imagePullPolicy" : {},
1030- "f:resources" : {
1031- "." : {},
1032- "f:limits" : {
1033- "." : {},
1034- "f:cpu" : {},
1035- "f:memory" : {},
1036- },
1037- "f:requests" : {
1038- "." : {},
1039- "f:cpu" : {},
1040- "f:memory" : {},
1041- },
1042- },
1043- "f:upscalingMode" : {},
1044- },
1045- "f:enableInTreeAutoscaling" : {},
1046- "f:headGroupSpec" : {
1047- "." : {},
1048- "f:rayStartParams" : {
1049- "." : {},
1050- "f:block" : {},
1051- "f:dashboard-host" : {},
1052- "f:num-gpus" : {},
1053- },
1054- "f:serviceType" : {},
1055- "f:template" : {
1056- "." : {},
1057- "f:spec" : {
1058- "." : {},
1059- "f:affinity" : {
1060- "." : {},
1061- "f:nodeAffinity" : {
1062- "." : {},
1063- "f:requiredDuringSchedulingIgnoredDuringExecution" : {},
1064- },
1065- },
1066- "f:imagePullSecrets" : {},
1067- "f:volumes" : {},
1068- },
1069- },
1070- },
1071- "f:rayVersion" : {},
1072- "f:workerGroupSpecs" : {},
1073- },
1074- },
1075- "manager" : "codeflare-operator" ,
1076- "operation" : "Update" ,
1077- "time" : "2024-03-05T09:55:37Z" ,
1078- },
1079- {
1080- "apiVersion" : "ray.io/v1alpha1" ,
1081- "fieldsType" : "FieldsV1" ,
1082- "fieldsV1" : {
1083- "f:status" : {
1084- "." : {},
1085- "f:desiredWorkerReplicas" : {},
1086- "f:endpoints" : {
1087- "." : {},
1088- "f:client" : {},
1089- "f:dashboard" : {},
1090- "f:gcs" : {},
1091- "f:metrics" : {},
1092- },
1093- "f:head" : {"." : {}, "f:serviceIP" : {}},
1094- "f:lastUpdateTime" : {},
1095- "f:maxWorkerReplicas" : {},
1096- "f:minWorkerReplicas" : {},
1097- "f:observedGeneration" : {},
1098- }
1099- },
1100- "manager" : "manager" ,
1101- "operation" : "Update" ,
1102- "subresource" : "status" ,
1103- "time" : "2024-03-05T09:55:37Z" ,
1104- },
1105- ],
11061006 "name" : "quicktest" ,
11071007 "namespace" : "ns" ,
11081008 "ownerReferences" : [
@@ -1673,65 +1573,8 @@ def get_aw_obj(group, version, namespace, plural):
16731573 "apiVersion" : "workload.codeflare.dev/v1beta1" ,
16741574 "kind" : "AppWrapper" ,
16751575 "metadata" : {
1676- "annotations" : {
1677- "kubectl.kubernetes.io/last-applied-configuration" : '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest1","namespace":"ns"},"spec":{"resources":{"GenericItems":[{"custompodresources":[{"limits":{"cpu":2,"memory":"8G","nvidia.com/gpu":0},"replicas":1,"requests":{"cpu":2,"memory":"8G","nvidia.com/gpu":0}},{"limits":{"cpu":1,"memory":"2G","nvidia.com/gpu":0},"replicas":1,"requests":{"cpu":1,"memory":"2G","nvidia.com/gpu":0}}],"generictemplate":{"apiVersion":"ray.io/v1","kind":"RayCluster","metadata":{"labels":{"appwrapper.codeflare.dev":"quicktest1","controller-tools.k8s.io":"1.0"},"name":"quicktest1","namespace":"ns"},"spec":{"autoscalerOptions":{"idleTimeoutSeconds":60,"imagePullPolicy":"Always","resources":{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"500m","memory":"512Mi"}},"upscalingMode":"Default"},"enableInTreeAutoscaling":false,"headGroupSpec":{"rayStartParams":{"block":"true","dashboard-host":"0.0.0.0","num-gpus":"0"},"serviceType":"ClusterIP","template":{"spec":{"containers":[{"image":"ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103","imagePullPolicy":"Always","lifecycle":{"preStop":{"exec":{"command":["/bin/sh","-c","ray stop"]}}},"name":"ray-head","ports":[{"containerPort":6379,"name":"gcs"},{"containerPort":8265,"name":"dashboard"},{"containerPort":10001,"name":"client"}],"resources":{"limits":{"cpu":2,"memory":"8G","nvidia.com/gpu":0},"requests":{"cpu":2,"memory":"8G","nvidia.com/gpu":0}}}]}}},"rayVersion":"1.12.0","workerGroupSpecs":[{"groupName":"small-group-quicktest","maxReplicas":1,"minReplicas":1,"rayStartParams":{"block":"true","num-gpus":"0"},"replicas":1,"template":{"metadata":{"annotations":{"key":"value"},"labels":{"key":"value"}},"spec":{"containers":[{"env":[{"name":"MY_POD_IP","valueFrom":{"fieldRef":{"fieldPath":"status.podIP"}}}],"image":"ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103","lifecycle":{"preStop":{"exec":{"command":["/bin/sh","-c","ray stop"]}}},"name":"machine-learning","resources":{"limits":{"cpu":1,"memory":"2G","nvidia.com/gpu":0},"requests":{"cpu":1,"memory":"2G","nvidia.com/gpu":0}}}],}}}]}},"replicas":1},{"generictemplate":{"apiVersion":"route.openshift.io/v1","kind":"Route","metadata":{"labels":{"odh-ray-cluster-service":"quicktest-head-svc"},"name":"ray-dashboard-quicktest","namespace":"default"},"spec":{"port":{"targetPort":"dashboard"},"to":{"kind":"Service","name":"quicktest-head-svc"}}},"replica":1}],"Items":[]}}}\n '
1678- },
1679- "creationTimestamp" : "2023-02-22T16:26:07Z" ,
1680- "generation" : 4 ,
1681- "managedFields" : [
1682- {
1683- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
1684- "fieldsType" : "FieldsV1" ,
1685- "fieldsV1" : {
1686- "f:spec" : {
1687- "f:resources" : {
1688- "f:GenericItems" : {},
1689- "f:metadata" : {},
1690- },
1691- "f:schedulingSpec" : {},
1692- "f:service" : {"." : {}, "f:spec" : {}},
1693- },
1694- "f:status" : {
1695- "." : {},
1696- "f:canrun" : {},
1697- "f:conditions" : {},
1698- "f:controllerfirsttimestamp" : {},
1699- "f:filterignore" : {},
1700- "f:queuejobstate" : {},
1701- "f:sender" : {},
1702- "f:state" : {},
1703- "f:systempriority" : {},
1704- },
1705- },
1706- "manager" : "Go-http-client" ,
1707- "operation" : "Update" ,
1708- "time" : "2023-02-22T16:26:07Z" ,
1709- },
1710- {
1711- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
1712- "fieldsType" : "FieldsV1" ,
1713- "fieldsV1" : {
1714- "f:metadata" : {
1715- "f:annotations" : {
1716- "." : {},
1717- "f:kubectl.kubernetes.io/last-applied-configuration" : {},
1718- }
1719- },
1720- "f:spec" : {
1721- "." : {},
1722- "f:priority" : {},
1723- "f:resources" : {"." : {}, "f:Items" : {}},
1724- },
1725- },
1726- "manager" : "kubectl-client-side-apply" ,
1727- "operation" : "Update" ,
1728- "time" : "2023-02-22T16:26:07Z" ,
1729- },
1730- ],
17311576 "name" : "quicktest1" ,
17321577 "namespace" : "ns" ,
1733- "resourceVersion" : "9482384" ,
1734- "uid" : "6334fc1b-471e-4876-8e7b-0b2277679235" ,
17351578 },
17361579 "spec" : {
17371580 "resources" : {
@@ -1999,65 +1842,8 @@ def get_aw_obj(group, version, namespace, plural):
19991842 "apiVersion" : "workload.codeflare.dev/v1beta1" ,
20001843 "kind" : "AppWrapper" ,
20011844 "metadata" : {
2002- "annotations" : {
2003- "kubectl.kubernetes.io/last-applied-configuration" : '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest2","namespace":"ns"},"spec":{"resources":{"GenericItems":[{"custompodresources":[{"limits":{"cpu":2,"memory":"8G","nvidia.com/gpu":0},"replicas":1,"requests":{"cpu":2,"memory":"8G","nvidia.com/gpu":0}},{"limits":{"cpu":1,"memory":"2G","nvidia.com/gpu":0},"replicas":1,"requests":{"cpu":1,"memory":"2G","nvidia.com/gpu":0}}],"generictemplate":{"apiVersion":"ray.io/v1","kind":"RayCluster","metadata":{"labels":{"appwrapper.codeflare.dev":"quicktest2","controller-tools.k8s.io":"1.0"},"name":"quicktest2","namespace":"ns"},"spec":{"autoscalerOptions":{"idleTimeoutSeconds":60,"imagePullPolicy":"Always","resources":{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"500m","memory":"512Mi"}},"upscalingMode":"Default"},"enableInTreeAutoscaling":false,"headGroupSpec":{"rayStartParams":{"block":"true","dashboard-host":"0.0.0.0","num-gpus":"0"},"serviceType":"ClusterIP","template":{"spec":{"containers":[{"image":"ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103","imagePullPolicy":"Always","lifecycle":{"preStop":{"exec":{"command":["/bin/sh","-c","ray stop"]}}},"name":"ray-head","ports":[{"containerPort":6379,"name":"gcs"},{"containerPort":8265,"name":"dashboard"},{"containerPort":10001,"name":"client"}],"resources":{"limits":{"cpu":2,"memory":"8G","nvidia.com/gpu":0},"requests":{"cpu":2,"memory":"8G","nvidia.com/gpu":0}}}]}}},"rayVersion":"1.12.0","workerGroupSpecs":[{"groupName":"small-group-quicktest","maxReplicas":1,"minReplicas":1,"rayStartParams":{"block":"true","num-gpus":"0"},"replicas":1,"template":{"metadata":{"annotations":{"key":"value"},"labels":{"key":"value"}},"spec":{"containers":[{"env":[{"name":"MY_POD_IP","valueFrom":{"fieldRef":{"fieldPath":"status.podIP"}}}],"image":"ghcr.io/foundation-model-stack/base:ray2.1.0-py38-gpu-pytorch1.12.0cu116-20221213-193103","lifecycle":{"preStop":{"exec":{"command":["/bin/sh","-c","ray stop"]}}},"name":"machine-learning","resources":{"limits":{"cpu":1,"memory":"2G","nvidia.com/gpu":0},"requests":{"cpu":1,"memory":"2G","nvidia.com/gpu":0}}}],}}}]}},"replicas":1},{"generictemplate":{"apiVersion":"route.openshift.io/v1","kind":"Route","metadata":{"labels":{"odh-ray-cluster-service":"quicktest-head-svc"},"name":"ray-dashboard-quicktest","namespace":"default"},"spec":{"port":{"targetPort":"dashboard"},"to":{"kind":"Service","name":"quicktest-head-svc"}}},"replica":1}],"Items":[]}}}\n '
2004- },
2005- "creationTimestamp" : "2023-02-22T16:26:07Z" ,
2006- "generation" : 4 ,
2007- "managedFields" : [
2008- {
2009- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
2010- "fieldsType" : "FieldsV1" ,
2011- "fieldsV1" : {
2012- "f:spec" : {
2013- "f:resources" : {
2014- "f:GenericItems" : {},
2015- "f:metadata" : {},
2016- },
2017- "f:schedulingSpec" : {},
2018- "f:service" : {"." : {}, "f:spec" : {}},
2019- },
2020- "f:status" : {
2021- "." : {},
2022- "f:canrun" : {},
2023- "f:conditions" : {},
2024- "f:controllerfirsttimestamp" : {},
2025- "f:filterignore" : {},
2026- "f:queuejobstate" : {},
2027- "f:sender" : {},
2028- "f:state" : {},
2029- "f:systempriority" : {},
2030- },
2031- },
2032- "manager" : "Go-http-client" ,
2033- "operation" : "Update" ,
2034- "time" : "2023-02-22T16:26:07Z" ,
2035- },
2036- {
2037- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
2038- "fieldsType" : "FieldsV1" ,
2039- "fieldsV1" : {
2040- "f:metadata" : {
2041- "f:annotations" : {
2042- "." : {},
2043- "f:kubectl.kubernetes.io/last-applied-configuration" : {},
2044- }
2045- },
2046- "f:spec" : {
2047- "." : {},
2048- "f:priority" : {},
2049- "f:resources" : {"." : {}, "f:Items" : {}},
2050- },
2051- },
2052- "manager" : "kubectl-client-side-apply" ,
2053- "operation" : "Update" ,
2054- "time" : "2023-02-22T16:26:07Z" ,
2055- },
2056- ],
20571845 "name" : "quicktest2" ,
20581846 "namespace" : "ns" ,
2059- "resourceVersion" : "9482384" ,
2060- "uid" : "6334fc1b-471e-4876-8e7b-0b2277679235" ,
20611847 },
20621848 "spec" : {
20631849 "resources" : {
0 commit comments