Skip to content

Commit d39d5fb

Browse files
Maxusmustiopenshift-merge-robot
Maxusmusti
authored and
openshift-merge-robot
committed
Correct Recently Changed API Groups and Labels
1 parent 4d8adcb commit d39d5fb

File tree

13 files changed

+41
-41
lines changed

13 files changed

+41
-41
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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.codeflare.dev: gptfttest
36+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.codeflare.dev: instascaletest
36+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.codeflare.dev: interactivetest
36+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.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.codeflare.dev: jobtest
34+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.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.codeflare.dev: raytest
34+
appwrapper.mcad.ibm.com: 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="codeflare.dev",
64+
group="workload.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="codeflare.dev",
89+
group="workload.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="codeflare.dev",
159+
group="workload.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="codeflare.dev",
178+
group="workload.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="codeflare.dev",
495+
group="workload.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="codeflare.dev",
556+
group="workload.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: codeflare.dev/v1beta1
1+
apiVersion: workload.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.codeflare.dev: "aw-kuberay"
44+
appwrapper.mcad.ibm.com: "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.codeflare.dev"] = appwrapper_name
71+
lower_meta["labels"]["appwrapper.mcad.ibm.com"] = 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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppsWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.codeflare.dev: unit-test-cluster
36+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -33,7 +33,7 @@ spec:
3333
kind: RayCluster
3434
metadata:
3535
labels:
36-
appwrapper.codeflare.dev: prio-test-cluster
36+
appwrapper.mcad.ibm.com: 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: codeflare.dev/v1beta1
1+
apiVersion: workload.codeflare.dev/v1beta1
22
kind: AppWrapper
33
metadata:
44
labels:
@@ -32,7 +32,7 @@ spec:
3232
kind: RayCluster
3333
metadata:
3434
labels:
35-
appwrapper.codeflare.dev: unit-test-cluster
35+
appwrapper.mcad.ibm.com: unit-test-cluster
3636
controller-tools.k8s.io: '1.0'
3737
name: unit-test-cluster
3838
namespace: ns

‎tests/unit_test.py

+16-16
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ def test_default_cluster_creation(mocker):
281281

282282

283283
def arg_check_apply_effect(group, version, namespace, plural, body, *args):
284-
assert group == "codeflare.dev"
284+
assert group == "workload.codeflare.dev"
285285
assert version == "v1beta1"
286286
assert namespace == "ns"
287287
assert plural == "appwrappers"
@@ -292,7 +292,7 @@ def arg_check_apply_effect(group, version, namespace, plural, body, *args):
292292

293293

294294
def arg_check_del_effect(group, version, namespace, plural, name, *args):
295-
assert group == "codeflare.dev"
295+
assert group == "workload.codeflare.dev"
296296
assert version == "v1beta1"
297297
assert namespace == "ns"
298298
assert plural == "appwrappers"
@@ -320,7 +320,7 @@ def test_cluster_up_down(mocker):
320320

321321

322322
def aw_status_fields(group, version, namespace, plural, *args):
323-
assert group == "codeflare.dev"
323+
assert group == "workload.codeflare.dev"
324324
assert version == "v1beta1"
325325
assert namespace == "test-ns"
326326
assert plural == "appwrappers"
@@ -651,7 +651,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
651651
"creationTimestamp": "2023-02-22T16:26:07Z",
652652
"generation": 1,
653653
"labels": {
654-
"appwrapper.codeflare.dev": "quicktest",
654+
"appwrapper.mcad.ibm.com": "quicktest",
655655
"controller-tools.k8s.io": "1.0",
656656
"resourceName": "quicktest",
657657
"orderedinstance": "m4.xlarge_g4dn.xlarge",
@@ -664,7 +664,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
664664
"f:metadata": {
665665
"f:labels": {
666666
".": {},
667-
"f:appwrapper.codeflare.dev": {},
667+
"f:appwrapper.mcad.ibm.com": {},
668668
"f:controller-tools.k8s.io": {},
669669
"f:resourceName": {},
670670
},
@@ -747,7 +747,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
747747
"namespace": "ns",
748748
"ownerReferences": [
749749
{
750-
"apiVersion": "codeflare.dev/v1beta1",
750+
"apiVersion": "workload.codeflare.dev/v1beta1",
751751
"blockOwnerDeletion": True,
752752
"controller": True,
753753
"kind": "AppWrapper",
@@ -920,7 +920,7 @@ def get_aw_obj(group, version, namespace, plural):
920920
api_obj1 = {
921921
"items": [
922922
{
923-
"apiVersion": "codeflare.dev/v1beta1",
923+
"apiVersion": "workload.codeflare.dev/v1beta1",
924924
"kind": "AppWrapper",
925925
"metadata": {
926926
"annotations": {
@@ -930,7 +930,7 @@ def get_aw_obj(group, version, namespace, plural):
930930
"generation": 4,
931931
"managedFields": [
932932
{
933-
"apiVersion": "codeflare.dev/v1beta1",
933+
"apiVersion": "workload.codeflare.dev/v1beta1",
934934
"fieldsType": "FieldsV1",
935935
"fieldsV1": {
936936
"f:spec": {
@@ -958,7 +958,7 @@ def get_aw_obj(group, version, namespace, plural):
958958
"time": "2023-02-22T16:26:07Z",
959959
},
960960
{
961-
"apiVersion": "codeflare.dev/v1beta1",
961+
"apiVersion": "workload.codeflare.dev/v1beta1",
962962
"fieldsType": "FieldsV1",
963963
"fieldsV1": {
964964
"f:metadata": {
@@ -1022,7 +1022,7 @@ def get_aw_obj(group, version, namespace, plural):
10221022
"kind": "RayCluster",
10231023
"metadata": {
10241024
"labels": {
1025-
"appwrapper.codeflare.dev": "quicktest1",
1025+
"appwrapper.mcad.ibm.com": "quicktest1",
10261026
"controller-tools.k8s.io": "1.0",
10271027
},
10281028
"name": "quicktest1",
@@ -1243,7 +1243,7 @@ def get_aw_obj(group, version, namespace, plural):
12431243
},
12441244
},
12451245
{
1246-
"apiVersion": "codeflare.dev/v1beta1",
1246+
"apiVersion": "workload.codeflare.dev/v1beta1",
12471247
"kind": "AppWrapper",
12481248
"metadata": {
12491249
"annotations": {
@@ -1253,7 +1253,7 @@ def get_aw_obj(group, version, namespace, plural):
12531253
"generation": 4,
12541254
"managedFields": [
12551255
{
1256-
"apiVersion": "codeflare.dev/v1beta1",
1256+
"apiVersion": "workload.codeflare.dev/v1beta1",
12571257
"fieldsType": "FieldsV1",
12581258
"fieldsV1": {
12591259
"f:spec": {
@@ -1281,7 +1281,7 @@ def get_aw_obj(group, version, namespace, plural):
12811281
"time": "2023-02-22T16:26:07Z",
12821282
},
12831283
{
1284-
"apiVersion": "codeflare.dev/v1beta1",
1284+
"apiVersion": "workload.codeflare.dev/v1beta1",
12851285
"fieldsType": "FieldsV1",
12861286
"fieldsV1": {
12871287
"f:metadata": {
@@ -1345,7 +1345,7 @@ def get_aw_obj(group, version, namespace, plural):
13451345
"kind": "RayCluster",
13461346
"metadata": {
13471347
"labels": {
1348-
"appwrapper.codeflare.dev": "quicktest2",
1348+
"appwrapper.mcad.ibm.com": "quicktest2",
13491349
"controller-tools.k8s.io": "1.0",
13501350
},
13511351
"name": "quicktest2",
@@ -2155,7 +2155,7 @@ def test_AWManager_creation():
21552155

21562156

21572157
def arg_check_aw_apply_effect(group, version, namespace, plural, body, *args):
2158-
assert group == "codeflare.dev"
2158+
assert group == "workload.codeflare.dev"
21592159
assert version == "v1beta1"
21602160
assert namespace == "ns"
21612161
assert plural == "appwrappers"
@@ -2166,7 +2166,7 @@ def arg_check_aw_apply_effect(group, version, namespace, plural, body, *args):
21662166

21672167

21682168
def arg_check_aw_del_effect(group, version, namespace, plural, name, *args):
2169-
assert group == "codeflare.dev"
2169+
assert group == "workload.codeflare.dev"
21702170
assert version == "v1beta1"
21712171
assert namespace == "ns"
21722172
assert plural == "appwrappers"

0 commit comments

Comments
 (0)