Skip to content
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

Update RayCluster labels to workload.codeflare.dev/appwrappers #384

Merged
merged 2 commits into from
Oct 25, 2023
Merged

Update RayCluster labels to workload.codeflare.dev/appwrappers #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75dce2
Update RayCluster labels to workload.codeflare.dev/appwrappers
ChristianZaccaria Oct 16, 2023
6c74af4
Update unit tests to reflect label update
ChristianZaccaria Oct 16, 2023
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
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/gptfttest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: gptfttest
workload.codeflare.dev/appwrapper: gptfttest
controller-tools.k8s.io: '1.0'
name: gptfttest
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/instascaletest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: instascaletest
workload.codeflare.dev/appwrapper: instascaletest
controller-tools.k8s.io: '1.0'
name: instascaletest
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/interactivetest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: interactivetest
workload.codeflare.dev/appwrapper: interactivetest
controller-tools.k8s.io: '1.0'
name: interactivetest
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/jobtest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: jobtest
workload.codeflare.dev/appwrapper: jobtest
controller-tools.k8s.io: '1.0'
name: jobtest
namespace: default
Expand Down
2 changes: 1 addition & 1 deletion demo-notebooks/guided-demos/notebook-ex-outputs/raytest.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: raytest
workload.codeflare.dev/appwrapper: raytest
controller-tools.k8s.io: '1.0'
name: raytest
namespace: default
Expand Down
4 changes: 2 additions & 2 deletions docs/utils/generate_yaml.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
metadata[&#34;name&#34;] = appwrapper_name
metadata[&#34;namespace&#34;] = namespace
lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
lower_meta[&#34;name&#34;] = cluster_name
lower_meta[&#34;namespace&#34;] = namespace

Expand Down Expand Up @@ -917,7 +917,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
metadata[&#34;name&#34;] = appwrapper_name
metadata[&#34;namespace&#34;] = namespace
lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
lower_meta[&#34;name&#34;] = cluster_name
lower_meta[&#34;namespace&#34;] = namespace</code></pre>
</details>
Expand Down
2 changes: 1 addition & 1 deletion src/codeflare_sdk/templates/base-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: "aw-kuberay"
workload.codeflare.dev/appwrapper: "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.mcad.ibm.com"] = appwrapper_name
lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
lower_meta["name"] = cluster_name
lower_meta["namespace"] = namespace

Expand Down
2 changes: 1 addition & 1 deletion tests/test-case-bad.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: unit-test-cluster
workload.codeflare.dev/appwrapper: unit-test-cluster
controller-tools.k8s.io: '1.0'
name: unit-test-cluster
namespace: ns
Expand Down
2 changes: 1 addition & 1 deletion tests/test-case-prio.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: prio-test-cluster
controller-tools.k8s.io: '1.0'
workload.codeflare.dev/appwrapper: prio-test-cluster
name: prio-test-cluster
namespace: ns
spec:
Expand Down
2 changes: 1 addition & 1 deletion tests/test-case.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ spec:
kind: RayCluster
metadata:
labels:
appwrapper.mcad.ibm.com: unit-test-cluster
controller-tools.k8s.io: '1.0'
workload.codeflare.dev/appwrapper: unit-test-cluster
name: unit-test-cluster
namespace: ns
spec:
Expand Down
8 changes: 4 additions & 4 deletions tests/unit_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
"creationTimestamp": "2023-02-22T16:26:07Z",
"generation": 1,
"labels": {
"appwrapper.mcad.ibm.com": "quicktest",
"workload.codeflare.dev/appwrapper": "quicktest",
"controller-tools.k8s.io": "1.0",
"resourceName": "quicktest",
"orderedinstance": "m4.xlarge_g4dn.xlarge",
Expand All @@ -667,7 +667,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
"f:metadata": {
"f:labels": {
".": {},
"f:appwrapper.mcad.ibm.com": {},
"f:workload.codeflare.dev/appwrapper": {},
"f:controller-tools.k8s.io": {},
"f:resourceName": {},
},
Expand Down Expand Up @@ -1025,7 +1025,7 @@ def get_aw_obj(group, version, namespace, plural):
"kind": "RayCluster",
"metadata": {
"labels": {
"appwrapper.mcad.ibm.com": "quicktest1",
"workload.codeflare.dev/appwrapper": "quicktest1",
"controller-tools.k8s.io": "1.0",
},
"name": "quicktest1",
Expand Down Expand Up @@ -1348,7 +1348,7 @@ def get_aw_obj(group, version, namespace, plural):
"kind": "RayCluster",
"metadata": {
"labels": {
"appwrapper.mcad.ibm.com": "quicktest2",
"workload.codeflare.dev/appwrapper": "quicktest2",
"controller-tools.k8s.io": "1.0",
},
"name": "quicktest2",
Expand Down