Skip to content

Commit c06c397

Browse files
Maxusmustiopenshift-merge-robot
authored andcommitted
Updated AW API Group to codeflare.dev
1 parent 0f16b1e commit c06c397

File tree

13 files changed

+43
-43
lines changed

13 files changed

+43
-43
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.mcad.ibm.com: gptfttest
36+
appwrapper.codeflare.dev: gptfttest
3737
controller-tools.k8s.io: '1.0'
3838
name: gptfttest
3939
namespace: default

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.mcad.ibm.com: instascaletest
36+
appwrapper.codeflare.dev: instascaletest
3737
controller-tools.k8s.io: '1.0'
3838
name: instascaletest
3939
namespace: default

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.mcad.ibm.com: interactivetest
36+
appwrapper.codeflare.dev: interactivetest
3737
controller-tools.k8s.io: '1.0'
3838
name: interactivetest
3939
namespace: default

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: jobtest
@@ -31,7 +31,7 @@ spec:
3131
kind: RayCluster
3232
metadata:
3333
labels:
34-
appwrapper.mcad.ibm.com: jobtest
34+
appwrapper.codeflare.dev: jobtest
3535
controller-tools.k8s.io: '1.0'
3636
name: jobtest
3737
namespace: default

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: raytest
@@ -31,7 +31,7 @@ spec:
3131
kind: RayCluster
3232
metadata:
3333
labels:
34-
appwrapper.mcad.ibm.com: raytest
34+
appwrapper.codeflare.dev: raytest
3535
controller-tools.k8s.io: '1.0'
3636
name: raytest
3737
namespace: default

src/codeflare_sdk/cluster/awload.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def submit(self) -> None:
6161
config_check()
6262
api_instance = client.CustomObjectsApi(api_config_handler())
6363
api_instance.create_namespaced_custom_object(
64-
group="mcad.ibm.com",
64+
group="codeflare.dev",
6565
version="v1beta1",
6666
namespace=self.namespace,
6767
plural="appwrappers",
@@ -86,7 +86,7 @@ def remove(self) -> None:
8686
config_check()
8787
api_instance = client.CustomObjectsApi(api_config_handler())
8888
api_instance.delete_namespaced_custom_object(
89-
group="mcad.ibm.com",
89+
group="codeflare.dev",
9090
version="v1beta1",
9191
namespace=self.namespace,
9292
plural="appwrappers",

src/codeflare_sdk/cluster/cluster.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def up(self):
156156
with open(self.app_wrapper_yaml) as f:
157157
aw = yaml.load(f, Loader=yaml.FullLoader)
158158
api_instance.create_namespaced_custom_object(
159-
group="mcad.ibm.com",
159+
group="codeflare.dev",
160160
version="v1beta1",
161161
namespace=namespace,
162162
plural="appwrappers",
@@ -175,7 +175,7 @@ def down(self):
175175
config_check()
176176
api_instance = client.CustomObjectsApi(api_config_handler())
177177
api_instance.delete_namespaced_custom_object(
178-
group="mcad.ibm.com",
178+
group="codeflare.dev",
179179
version="v1beta1",
180180
namespace=namespace,
181181
plural="appwrappers",
@@ -492,7 +492,7 @@ def _app_wrapper_status(name, namespace="default") -> Optional[AppWrapper]:
492492
config_check()
493493
api_instance = client.CustomObjectsApi(api_config_handler())
494494
aws = api_instance.list_namespaced_custom_object(
495-
group="mcad.ibm.com",
495+
group="codeflare.dev",
496496
version="v1beta1",
497497
namespace=namespace,
498498
plural="appwrappers",
@@ -553,7 +553,7 @@ def _get_app_wrappers(
553553
config_check()
554554
api_instance = client.CustomObjectsApi(api_config_handler())
555555
aws = api_instance.list_namespaced_custom_object(
556-
group="mcad.ibm.com",
556+
group="codeflare.dev",
557557
version="v1beta1",
558558
namespace=namespace,
559559
plural="appwrappers",

src/codeflare_sdk/templates/base-template.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
name: aw-kuberay
@@ -41,7 +41,7 @@ spec:
4141
kind: RayCluster
4242
metadata:
4343
labels:
44-
appwrapper.mcad.ibm.com: "aw-kuberay"
44+
appwrapper.codeflare.dev: "aw-kuberay"
4545
controller-tools.k8s.io: "1.0"
4646
# A unique identifier for the head node and workers of this cluster.
4747
name: kuberay-cluster

src/codeflare_sdk/utils/generate_yaml.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
6868
metadata["name"] = appwrapper_name
6969
metadata["namespace"] = namespace
7070
lower_meta = item.get("generictemplate", {}).get("metadata")
71-
lower_meta["labels"]["appwrapper.mcad.ibm.com"] = appwrapper_name
71+
lower_meta["labels"]["appwrapper.codeflare.dev"] = appwrapper_name
7272
lower_meta["name"] = cluster_name
7373
lower_meta["namespace"] = namespace
7474

tests/test-case-bad.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppsWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.mcad.ibm.com: unit-test-cluster
36+
appwrapper.codeflare.dev: unit-test-cluster
3737
controller-tools.k8s.io: '1.0'
3838
name: unit-test-cluster
3939
namespace: ns

tests/test-case-prio.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.mcad.ibm.com: prio-test-cluster
36+
appwrapper.codeflare.dev: prio-test-cluster
3737
controller-tools.k8s.io: '1.0'
3838
name: prio-test-cluster
3939
namespace: ns

tests/test-case.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: mcad.ibm.com/v1beta1
1+
apiVersion: codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -32,7 +32,7 @@ spec:
3232
kind: RayCluster
3333
metadata:
3434
labels:
35-
appwrapper.mcad.ibm.com: unit-test-cluster
35+
appwrapper.codeflare.dev: unit-test-cluster
3636
controller-tools.k8s.io: '1.0'
3737
name: unit-test-cluster
3838
namespace: ns

tests/unit_test.py

+18-18
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)