Skip to content

Correct Recently Changed API Groups and Labels #342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2023
Merged

Correct Recently Changed API Groups and Labels #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
name: jobtest
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
name: raytest
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/codeflare_sdk/cluster/awload.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions src/codeflare_sdk/cluster/cluster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/codeflare_sdk/templates/base-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
name: aw-kuberay
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/codeflare_sdk/utils/generate_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tests/test-case-bad.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppsWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test-case-prio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/test-case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: codeflare.dev/v1beta1
apiVersion: workload.codeflare.dev/v1beta1
kind: AppWrapper
metadata:
labels:
Expand Down Expand Up @@ -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
Expand Down
32 changes: 16 additions & 16 deletions tests/unit_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand All @@ -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": {},
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down