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