Correct Recently Changed API Groups and Labels

Author: Maxusmusti

demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   labels:
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: gptfttest
+            appwrapper.mcad.ibm.com: gptfttest
             controller-tools.k8s.io: '1.0'
           name: gptfttest
           namespace: default

demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   labels:
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: instascaletest
+            appwrapper.mcad.ibm.com: instascaletest
             controller-tools.k8s.io: '1.0'
           name: instascaletest
           namespace: default

demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   labels:
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: interactivetest
+            appwrapper.mcad.ibm.com: interactivetest
             controller-tools.k8s.io: '1.0'
           name: interactivetest
           namespace: default

demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: jobtest
@@ -31,7 +31,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: jobtest
+            appwrapper.mcad.ibm.com: jobtest
             controller-tools.k8s.io: '1.0'
           name: jobtest
           namespace: default

demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: raytest
@@ -31,7 +31,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: raytest
+            appwrapper.mcad.ibm.com: raytest
             controller-tools.k8s.io: '1.0'
           name: raytest
           namespace: default

src/codeflare_sdk/cluster/awload.py

@@ -61,7 +61,7 @@ def submit(self) -> None:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.create_namespaced_custom_object(
-                group="codeflare.dev",
+                group="workload.codeflare.dev",
                 version="v1beta1",
                 namespace=self.namespace,
                 plural="appwrappers",
@@ -86,7 +86,7 @@ def remove(self) -> None:
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.delete_namespaced_custom_object(
-                group="codeflare.dev",
+                group="workload.codeflare.dev",
                 version="v1beta1",
                 namespace=self.namespace,
                 plural="appwrappers",

src/codeflare_sdk/cluster/cluster.py

@@ -156,7 +156,7 @@ def up(self):
             with open(self.app_wrapper_yaml) as f:
                 aw = yaml.load(f, Loader=yaml.FullLoader)
             api_instance.create_namespaced_custom_object(
-                group="codeflare.dev",
+                group="workload.codeflare.dev",
                 version="v1beta1",
                 namespace=namespace,
                 plural="appwrappers",
@@ -175,7 +175,7 @@ def down(self):
             config_check()
             api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.delete_namespaced_custom_object(
-                group="codeflare.dev",
+                group="workload.codeflare.dev",
                 version="v1beta1",
                 namespace=namespace,
                 plural="appwrappers",
@@ -492,7 +492,7 @@ def _app_wrapper_status(name, namespace="default") -> Optional[AppWrapper]:
         config_check()
         api_instance = client.CustomObjectsApi(api_config_handler())
         aws = api_instance.list_namespaced_custom_object(
-            group="codeflare.dev",
+            group="workload.codeflare.dev",
             version="v1beta1",
             namespace=namespace,
             plural="appwrappers",
@@ -553,7 +553,7 @@ def _get_app_wrappers(
         config_check()
         api_instance = client.CustomObjectsApi(api_config_handler())
         aws = api_instance.list_namespaced_custom_object(
-            group="codeflare.dev",
+            group="workload.codeflare.dev",
             version="v1beta1",
             namespace=namespace,
             plural="appwrappers",

src/codeflare_sdk/templates/base-template.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   name: aw-kuberay
@@ -41,7 +41,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: "aw-kuberay"
+            appwrapper.mcad.ibm.com: "aw-kuberay"
             controller-tools.k8s.io: "1.0"
             # A unique identifier for the head node and workers of this cluster.
           name: kuberay-cluster

src/codeflare_sdk/utils/generate_yaml.py

@@ -68,7 +68,7 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
     metadata["name"] = appwrapper_name
     metadata["namespace"] = namespace
     lower_meta = item.get("generictemplate", {}).get("metadata")
-    lower_meta["labels"]["appwrapper.codeflare.dev"] = appwrapper_name
+    lower_meta["labels"]["appwrapper.mcad.ibm.com"] = appwrapper_name
     lower_meta["name"] = cluster_name
     lower_meta["namespace"] = namespace
 

tests/test-case-bad.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppsWrapper
 metadata:
   labels:
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: unit-test-cluster
+            appwrapper.mcad.ibm.com: unit-test-cluster
             controller-tools.k8s.io: '1.0'
           name: unit-test-cluster
           namespace: ns

tests/test-case-prio.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   labels:
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: prio-test-cluster
+            appwrapper.mcad.ibm.com: prio-test-cluster
             controller-tools.k8s.io: '1.0'
           name: prio-test-cluster
           namespace: ns

tests/test-case.yaml

@@ -1,4 +1,4 @@
-apiVersion: codeflare.dev/v1beta1
+apiVersion: workload.codeflare.dev/v1beta1
 kind: AppWrapper
 metadata:
   labels:
@@ -32,7 +32,7 @@ spec:
         kind: RayCluster
         metadata:
           labels:
-            appwrapper.codeflare.dev: unit-test-cluster
+            appwrapper.mcad.ibm.com: unit-test-cluster
             controller-tools.k8s.io: '1.0'
           name: unit-test-cluster
           namespace: ns

tests/unit_test.py

@@ -281,7 +281,7 @@ def test_default_cluster_creation(mocker):
 
 
 def arg_check_apply_effect(group, version, namespace, plural, body, *args):
-    assert group == "codeflare.dev"
+    assert group == "workload.codeflare.dev"
     assert version == "v1beta1"
     assert namespace == "ns"
     assert plural == "appwrappers"
@@ -292,7 +292,7 @@ def arg_check_apply_effect(group, version, namespace, plural, body, *args):
 
 
 def arg_check_del_effect(group, version, namespace, plural, name, *args):
-    assert group == "codeflare.dev"
+    assert group == "workload.codeflare.dev"
     assert version == "v1beta1"
     assert namespace == "ns"
     assert plural == "appwrappers"
@@ -320,7 +320,7 @@ def test_cluster_up_down(mocker):
 
 
 def aw_status_fields(group, version, namespace, plural, *args):
-    assert group == "codeflare.dev"
+    assert group == "workload.codeflare.dev"
     assert version == "v1beta1"
     assert namespace == "test-ns"
     assert plural == "appwrappers"
@@ -651,7 +651,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "creationTimestamp": "2023-02-22T16:26:07Z",
                     "generation": 1,
                     "labels": {
-                        "appwrapper.codeflare.dev": "quicktest",
+                        "appwrapper.mcad.ibm.com": "quicktest",
                         "controller-tools.k8s.io": "1.0",
                         "resourceName": "quicktest",
                         "orderedinstance": "m4.xlarge_g4dn.xlarge",
@@ -664,7 +664,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                                 "f:metadata": {
                                     "f:labels": {
                                         ".": {},
-                                        "f:appwrapper.codeflare.dev": {},
+                                        "f:appwrapper.mcad.ibm.com": {},
                                         "f:controller-tools.k8s.io": {},
                                         "f:resourceName": {},
                                     },
@@ -747,7 +747,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "namespace": "ns",
                     "ownerReferences": [
                         {
-                            "apiVersion": "codeflare.dev/v1beta1",
+                            "apiVersion": "workload.codeflare.dev/v1beta1",
                             "blockOwnerDeletion": True,
                             "controller": True,
                             "kind": "AppWrapper",
@@ -920,7 +920,7 @@ def get_aw_obj(group, version, namespace, plural):
     api_obj1 = {
         "items": [
             {
-                "apiVersion": "codeflare.dev/v1beta1",
+                "apiVersion": "workload.codeflare.dev/v1beta1",
                 "kind": "AppWrapper",
                 "metadata": {
                     "annotations": {
@@ -930,7 +930,7 @@ def get_aw_obj(group, version, namespace, plural):
                     "generation": 4,
                     "managedFields": [
                         {
-                            "apiVersion": "codeflare.dev/v1beta1",
+                            "apiVersion": "workload.codeflare.dev/v1beta1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:spec": {
@@ -958,7 +958,7 @@ def get_aw_obj(group, version, namespace, plural):
                             "time": "2023-02-22T16:26:07Z",
                         },
                         {
-                            "apiVersion": "codeflare.dev/v1beta1",
+                            "apiVersion": "workload.codeflare.dev/v1beta1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:metadata": {
@@ -1022,7 +1022,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "appwrapper.codeflare.dev": "quicktest1",
+                                            "appwrapper.mcad.ibm.com": "quicktest1",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest1",
@@ -1243,7 +1243,7 @@ def get_aw_obj(group, version, namespace, plural):
                 },
             },
             {
-                "apiVersion": "codeflare.dev/v1beta1",
+                "apiVersion": "workload.codeflare.dev/v1beta1",
                 "kind": "AppWrapper",
                 "metadata": {
                     "annotations": {
@@ -1253,7 +1253,7 @@ def get_aw_obj(group, version, namespace, plural):
                     "generation": 4,
                     "managedFields": [
                         {
-                            "apiVersion": "codeflare.dev/v1beta1",
+                            "apiVersion": "workload.codeflare.dev/v1beta1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:spec": {
@@ -1281,7 +1281,7 @@ def get_aw_obj(group, version, namespace, plural):
                             "time": "2023-02-22T16:26:07Z",
                         },
                         {
-                            "apiVersion": "codeflare.dev/v1beta1",
+                            "apiVersion": "workload.codeflare.dev/v1beta1",
                             "fieldsType": "FieldsV1",
                             "fieldsV1": {
                                 "f:metadata": {
@@ -1345,7 +1345,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "labels": {
-                                            "appwrapper.codeflare.dev": "quicktest2",
+                                            "appwrapper.mcad.ibm.com": "quicktest2",
                                             "controller-tools.k8s.io": "1.0",
                                         },
                                         "name": "quicktest2",
@@ -2155,7 +2155,7 @@ def test_AWManager_creation():
 
 
 def arg_check_aw_apply_effect(group, version, namespace, plural, body, *args):
-    assert group == "codeflare.dev"
+    assert group == "workload.codeflare.dev"
     assert version == "v1beta1"
     assert namespace == "ns"
     assert plural == "appwrappers"
@@ -2166,7 +2166,7 @@ def arg_check_aw_apply_effect(group, version, namespace, plural, body, *args):
 
 
 def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
-    assert group == "codeflare.dev"
+    assert group == "workload.codeflare.dev"
     assert version == "v1beta1"
     assert namespace == "ns"
     assert plural == "appwrappers"