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