@@ -977,106 +977,6 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
977977 "orderedinstance" : "m4.xlarge_g4dn.xlarge" ,
978978 "kueue.x-k8s.io/queue-name" : "team-a-queue" ,
979979 },
980- "managedFields" : [
981- {
982- "apiVersion" : "ray.io/v1" ,
983- "fieldsType" : "FieldsV1" ,
984- "fieldsV1" : {
985- "f:metadata" : {
986- "f:labels" : {
987- "." : {},
988- "f:appwrapper.mcad.ibm.com" : {},
989- "f:controller-tools.k8s.io" : {},
990- "f:resourceName" : {},
991- "f:workload.codeflare.dev/appwrapper" : {},
992- },
993- "f:ownerReferences" : {
994- "." : {},
995- 'k:{"uid":"a29b1a7a-0992-4860-a8d5-a689a751a3e8"}' : {},
996- },
997- },
998- "f:spec" : {
999- "." : {},
1000- "f:autoscalerOptions" : {
1001- "." : {},
1002- "f:idleTimeoutSeconds" : {},
1003- "f:imagePullPolicy" : {},
1004- "f:resources" : {
1005- "." : {},
1006- "f:limits" : {
1007- "." : {},
1008- "f:cpu" : {},
1009- "f:memory" : {},
1010- },
1011- "f:requests" : {
1012- "." : {},
1013- "f:cpu" : {},
1014- "f:memory" : {},
1015- },
1016- },
1017- "f:upscalingMode" : {},
1018- },
1019- "f:enableInTreeAutoscaling" : {},
1020- "f:headGroupSpec" : {
1021- "." : {},
1022- "f:rayStartParams" : {
1023- "." : {},
1024- "f:block" : {},
1025- "f:dashboard-host" : {},
1026- "f:num-gpus" : {},
1027- },
1028- "f:serviceType" : {},
1029- "f:template" : {
1030- "." : {},
1031- "f:spec" : {
1032- "." : {},
1033- "f:affinity" : {
1034- "." : {},
1035- "f:nodeAffinity" : {
1036- "." : {},
1037- "f:requiredDuringSchedulingIgnoredDuringExecution" : {},
1038- },
1039- },
1040- "f:imagePullSecrets" : {},
1041- "f:volumes" : {},
1042- },
1043- },
1044- },
1045- "f:rayVersion" : {},
1046- "f:workerGroupSpecs" : {},
1047- },
1048- },
1049- "manager" : "codeflare-operator" ,
1050- "operation" : "Update" ,
1051- "time" : "2024-03-05T09:55:37Z" ,
1052- },
1053- {
1054- "apiVersion" : "ray.io/v1alpha1" ,
1055- "fieldsType" : "FieldsV1" ,
1056- "fieldsV1" : {
1057- "f:status" : {
1058- "." : {},
1059- "f:desiredWorkerReplicas" : {},
1060- "f:endpoints" : {
1061- "." : {},
1062- "f:client" : {},
1063- "f:dashboard" : {},
1064- "f:gcs" : {},
1065- "f:metrics" : {},
1066- },
1067- "f:head" : {"." : {}, "f:serviceIP" : {}},
1068- "f:lastUpdateTime" : {},
1069- "f:maxWorkerReplicas" : {},
1070- "f:minWorkerReplicas" : {},
1071- "f:observedGeneration" : {},
1072- }
1073- },
1074- "manager" : "manager" ,
1075- "operation" : "Update" ,
1076- "subresource" : "status" ,
1077- "time" : "2024-03-05T09:55:37Z" ,
1078- },
1079- ],
1080980 "name" : "quicktest" ,
1081981 "namespace" : "ns" ,
1082982 "ownerReferences" : [
@@ -1647,65 +1547,8 @@ def get_aw_obj(group, version, namespace, plural):
16471547 "apiVersion" : "workload.codeflare.dev/v1beta1" ,
16481548 "kind" : "AppWrapper" ,
16491549 "metadata" : {
1650- "annotations" : {
1651- "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 '
1652- },
1653- "creationTimestamp" : "2023-02-22T16:26:07Z" ,
1654- "generation" : 4 ,
1655- "managedFields" : [
1656- {
1657- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
1658- "fieldsType" : "FieldsV1" ,
1659- "fieldsV1" : {
1660- "f:spec" : {
1661- "f:resources" : {
1662- "f:GenericItems" : {},
1663- "f:metadata" : {},
1664- },
1665- "f:schedulingSpec" : {},
1666- "f:service" : {"." : {}, "f:spec" : {}},
1667- },
1668- "f:status" : {
1669- "." : {},
1670- "f:canrun" : {},
1671- "f:conditions" : {},
1672- "f:controllerfirsttimestamp" : {},
1673- "f:filterignore" : {},
1674- "f:queuejobstate" : {},
1675- "f:sender" : {},
1676- "f:state" : {},
1677- "f:systempriority" : {},
1678- },
1679- },
1680- "manager" : "Go-http-client" ,
1681- "operation" : "Update" ,
1682- "time" : "2023-02-22T16:26:07Z" ,
1683- },
1684- {
1685- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
1686- "fieldsType" : "FieldsV1" ,
1687- "fieldsV1" : {
1688- "f:metadata" : {
1689- "f:annotations" : {
1690- "." : {},
1691- "f:kubectl.kubernetes.io/last-applied-configuration" : {},
1692- }
1693- },
1694- "f:spec" : {
1695- "." : {},
1696- "f:priority" : {},
1697- "f:resources" : {"." : {}, "f:Items" : {}},
1698- },
1699- },
1700- "manager" : "kubectl-client-side-apply" ,
1701- "operation" : "Update" ,
1702- "time" : "2023-02-22T16:26:07Z" ,
1703- },
1704- ],
17051550 "name" : "quicktest1" ,
17061551 "namespace" : "ns" ,
1707- "resourceVersion" : "9482384" ,
1708- "uid" : "6334fc1b-471e-4876-8e7b-0b2277679235" ,
17091552 },
17101553 "spec" : {
17111554 "resources" : {
@@ -1973,65 +1816,8 @@ def get_aw_obj(group, version, namespace, plural):
19731816 "apiVersion" : "workload.codeflare.dev/v1beta1" ,
19741817 "kind" : "AppWrapper" ,
19751818 "metadata" : {
1976- "annotations" : {
1977- "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 '
1978- },
1979- "creationTimestamp" : "2023-02-22T16:26:07Z" ,
1980- "generation" : 4 ,
1981- "managedFields" : [
1982- {
1983- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
1984- "fieldsType" : "FieldsV1" ,
1985- "fieldsV1" : {
1986- "f:spec" : {
1987- "f:resources" : {
1988- "f:GenericItems" : {},
1989- "f:metadata" : {},
1990- },
1991- "f:schedulingSpec" : {},
1992- "f:service" : {"." : {}, "f:spec" : {}},
1993- },
1994- "f:status" : {
1995- "." : {},
1996- "f:canrun" : {},
1997- "f:conditions" : {},
1998- "f:controllerfirsttimestamp" : {},
1999- "f:filterignore" : {},
2000- "f:queuejobstate" : {},
2001- "f:sender" : {},
2002- "f:state" : {},
2003- "f:systempriority" : {},
2004- },
2005- },
2006- "manager" : "Go-http-client" ,
2007- "operation" : "Update" ,
2008- "time" : "2023-02-22T16:26:07Z" ,
2009- },
2010- {
2011- "apiVersion" : "workload.codeflare.dev/v1beta1" ,
2012- "fieldsType" : "FieldsV1" ,
2013- "fieldsV1" : {
2014- "f:metadata" : {
2015- "f:annotations" : {
2016- "." : {},
2017- "f:kubectl.kubernetes.io/last-applied-configuration" : {},
2018- }
2019- },
2020- "f:spec" : {
2021- "." : {},
2022- "f:priority" : {},
2023- "f:resources" : {"." : {}, "f:Items" : {}},
2024- },
2025- },
2026- "manager" : "kubectl-client-side-apply" ,
2027- "operation" : "Update" ,
2028- "time" : "2023-02-22T16:26:07Z" ,
2029- },
2030- ],
20311819 "name" : "quicktest2" ,
20321820 "namespace" : "ns" ,
2033- "resourceVersion" : "9482384" ,
2034- "uid" : "6334fc1b-471e-4876-8e7b-0b2277679235" ,
20351821 },
20361822 "spec" : {
20371823 "resources" : {
0 commit comments