Updated ray v1alpha1 to v1

Bobbins228 · openshift-merge-bot[bot] · commit 62be50e23e7e · 2024-01-22T18:40:06.000Z
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
@@ -29,7 +29,7 @@ spec:
           memory: 8G
           nvidia.com/gpu: 1
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
@@ -29,7 +29,7 @@ spec:
           memory: 8G
           nvidia.com/gpu: 1
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
@@ -29,7 +29,7 @@ spec:
           memory: 8G
           nvidia.com/gpu: 1
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
@@ -27,7 +27,7 @@ spec:
           memory: 4G
           nvidia.com/gpu: 0
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml b/demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
@@ -27,7 +27,7 @@ spec:
           memory: 4G
           nvidia.com/gpu: 0
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/src/codeflare_sdk/cluster/cluster.py b/src/codeflare_sdk/cluster/cluster.py
@@ -557,7 +557,7 @@ def _component_resources_up(
                 if resource["kind"] == "RayCluster":
                     api_instance.create_namespaced_custom_object(
                         group="ray.io",
-                        version="v1alpha1",
+                        version="v1",
                         namespace=namespace,
                         plural="rayclusters",
                         body=resource,
@@ -594,7 +594,7 @@ def _component_resources_down(
                 if resource["kind"] == "RayCluster":
                     api_instance.delete_namespaced_custom_object(
                         group="ray.io",
-                        version="v1alpha1",
+                        version="v1",
                         namespace=namespace,
                         plural="rayclusters",
                         name=self.app_wrapper_name,
@@ -681,7 +681,7 @@ def get_cluster(cluster_name: str, namespace: str = "default"):
         api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group="ray.io",
-            version="v1alpha1",
+            version="v1",
             namespace=namespace,
             plural="rayclusters",
         )
@@ -838,7 +838,7 @@ def _ray_cluster_status(name, namespace="default") -> Optional[RayCluster]:
         api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group="ray.io",
-            version="v1alpha1",
+            version="v1",
             namespace=namespace,
             plural="rayclusters",
         )
@@ -858,7 +858,7 @@ def _get_ray_clusters(namespace="default") -> List[RayCluster]:
         api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group="ray.io",
-            version="v1alpha1",
+            version="v1",
             namespace=namespace,
             plural="rayclusters",
         )
diff --git a/src/codeflare_sdk/cluster/model.py b/src/codeflare_sdk/cluster/model.py
@@ -27,7 +27,7 @@ class RayClusterStatus(Enum):
     Defines the possible reportable states of a Ray cluster.
     """
 
-    # https://github.com/ray-project/kuberay/blob/master/ray-operator/apis/ray/v1alpha1/raycluster_types.go#L95
+    # https://github.com/ray-project/kuberay/blob/master/ray-operator/apis/ray/v1/raycluster_types.go#L112-L117
     READY = "ready"
     UNHEALTHY = "unhealthy"
     FAILED = "failed"
diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
@@ -37,7 +37,7 @@ spec:
         # The resource requests and limits in this config are too small for production!
         # For an example with more realistic resource configuration, see
         # ray-cluster.autoscaler.large.yaml.
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
@@ -29,7 +29,7 @@ spec:
           memory: 5G
           nvidia.com/gpu: 7
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -1,5 +1,5 @@
 ---
-apiVersion: ray.io/v1alpha1
+apiVersion: ray.io/v1
 kind: RayCluster
 metadata:
   labels:
diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
@@ -29,7 +29,7 @@ spec:
           memory: 5G
           nvidia.com/gpu: 7
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -28,7 +28,7 @@ spec:
           memory: 5G
           nvidia.com/gpu: 7
       generictemplate:
-        apiVersion: ray.io/v1alpha1
+        apiVersion: ray.io/v1
         kind: RayCluster
         metadata:
           labels:
diff --git a/tests/unit_test.py b/tests/unit_test.py
@@ -397,7 +397,7 @@ def arg_check_apply_effect(group, version, namespace, plural, body, *args):
         assert body == aw
     elif plural == "rayclusters":
         assert group == "ray.io"
-        assert version == "v1alpha1"
+        assert version == "v1"
         with open(f"{aw_dir}unit-test-cluster-ray.yaml") as f:
             yamls = yaml.load_all(f, Loader=yaml.FullLoader)
             for resource in yamls:
@@ -432,7 +432,7 @@ def arg_check_del_effect(group, version, namespace, plural, name, *args):
         assert name == "unit-test-cluster"
     elif plural == "rayclusters":
         assert group == "ray.io"
-        assert version == "v1alpha1"
+        assert version == "v1"
         assert name == "unit-test-cluster-ray"
     elif plural == "ingresses":
         assert group == "networking.k8s.io"
@@ -533,7 +533,7 @@ def test_aw_status(mocker):
 
 def rc_status_fields(group, version, namespace, plural, *args):
     assert group == "ray.io"
-    assert version == "v1alpha1"
+    assert version == "v1"
     assert namespace == "test-ns"
     assert plural == "rayclusters"
     assert args == tuple()
@@ -913,7 +913,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
     api_obj = {
         "items": [
             {
-                "apiVersion": "ray.io/v1alpha1",
+                "apiVersion": "ray.io/v1",
                 "kind": "RayCluster",
                 "metadata": {
                     "creationTimestamp": "2023-02-22T16:26:07Z",
@@ -926,7 +926,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     },
                     "managedFields": [
                         {
-                            "apiVersion": "ray.io/v1alpha1",
+                            "apiVersion": "ray.io/v1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:metadata": {
@@ -986,7 +986,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                             "time": "2023-02-22T16:26:07Z",
                         },
                         {
-                            "apiVersion": "ray.io/v1alpha1",
+                            "apiVersion": "ray.io/v1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:status": {
@@ -1186,7 +1186,7 @@ def get_aw_obj(group, version, namespace, plural):
                 "kind": "AppWrapper",
                 "metadata": {
                     "annotations": {
-                        "kubectl.kubernetes.io/last-applied-configuration": '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest1","namespace":"ns"},"spec":{"priority":9,"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/v1alpha1","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'
+                        "kubectl.kubernetes.io/last-applied-configuration": '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest1","namespace":"ns"},"spec":{"priority":9,"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'
                     },
                     "creationTimestamp": "2023-02-22T16:26:07Z",
                     "generation": 4,
@@ -1280,7 +1280,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     },
                                 ],
                                 "generictemplate": {
-                                    "apiVersion": "ray.io/v1alpha1",
+                                    "apiVersion": "ray.io/v1",
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
@@ -1514,7 +1514,7 @@ def get_aw_obj(group, version, namespace, plural):
                 "kind": "AppWrapper",
                 "metadata": {
                     "annotations": {
-                        "kubectl.kubernetes.io/last-applied-configuration": '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest2","namespace":"ns"},"spec":{"priority":9,"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/v1alpha1","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'
+                        "kubectl.kubernetes.io/last-applied-configuration": '{"apiVersion":"codeflare.dev/v1beta1","kind":"AppWrapper","metadata":{"annotations":{},"name":"quicktest2","namespace":"ns"},"spec":{"priority":9,"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'
                     },
                     "creationTimestamp": "2023-02-22T16:26:07Z",
                     "generation": 4,
@@ -1608,7 +1608,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     },
                                 ],
                                 "generictemplate": {
-                                    "apiVersion": "ray.io/v1alpha1",
+                                    "apiVersion": "ray.io/v1",
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
