Skip to content

Commit cc1dcd7

Browse files
Update RayCluster labels to workload.codeflare.dev/appwrappers
1 parent f57497e commit cc1dcd7

File tree

12 files changed

+16
-16
lines changed

12 files changed

+16
-16
lines changed

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

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

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

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

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

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

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

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

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

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

Diff for: docs/utils/generate_yaml.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h1 class="title">Module <code>codeflare_sdk.utils.generate_yaml</code></h1>
110110
metadata[&#34;name&#34;] = appwrapper_name
111111
metadata[&#34;namespace&#34;] = namespace
112112
lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
113-
lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
113+
lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
114114
lower_meta[&#34;name&#34;] = cluster_name
115115
lower_meta[&#34;namespace&#34;] = namespace
116116

@@ -1104,7 +1104,7 @@ <h2 class="section-title" id="header-functions">Functions</h2>
11041104
metadata[&#34;name&#34;] = appwrapper_name
11051105
metadata[&#34;namespace&#34;] = namespace
11061106
lower_meta = item.get(&#34;generictemplate&#34;, {}).get(&#34;metadata&#34;)
1107-
lower_meta[&#34;labels&#34;][&#34;appwrapper.mcad.ibm.com&#34;] = appwrapper_name
1107+
lower_meta[&#34;labels&#34;][&#34;workload.codeflare.dev/appwrapper&#34;] = appwrapper_name
11081108
lower_meta[&#34;name&#34;] = cluster_name
11091109
lower_meta[&#34;namespace&#34;] = namespace</code></pre>
11101110
</details>

Diff for: src/codeflare_sdk/templates/base-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
kind: RayCluster
4242
metadata:
4343
labels:
44-
appwrapper.mcad.ibm.com: "aw-kuberay"
44+
workload.codeflare.dev/appwrapper: "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

Diff for: src/codeflare_sdk/utils/generate_yaml.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def update_names(yaml, item, appwrapper_name, cluster_name, namespace):
7979
metadata["name"] = appwrapper_name
8080
metadata["namespace"] = namespace
8181
lower_meta = item.get("generictemplate", {}).get("metadata")
82-
lower_meta["labels"]["appwrapper.mcad.ibm.com"] = appwrapper_name
82+
lower_meta["labels"]["workload.codeflare.dev/appwrapper"] = appwrapper_name
8383
lower_meta["name"] = cluster_name
8484
lower_meta["namespace"] = namespace
8585

Diff for: tests/test-case-bad.yaml

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

Diff for: tests/test-case-prio.yaml

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

Diff for: tests/test-case.yaml

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

Diff for: tests/unit_test.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
743743
"creationTimestamp": "2023-02-22T16:26:07Z",
744744
"generation": 1,
745745
"labels": {
746-
"appwrapper.mcad.ibm.com": "quicktest",
746+
"workload.codeflare.dev/appwrapper": "quicktest",
747747
"controller-tools.k8s.io": "1.0",
748748
"resourceName": "quicktest",
749749
"orderedinstance": "m4.xlarge_g4dn.xlarge",
@@ -756,7 +756,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
756756
"f:metadata": {
757757
"f:labels": {
758758
".": {},
759-
"f:appwrapper.mcad.ibm.com": {},
759+
"f:workload.codeflare.dev/appwrapper": {},
760760
"f:controller-tools.k8s.io": {},
761761
"f:resourceName": {},
762762
},
@@ -1114,7 +1114,7 @@ def get_aw_obj(group, version, namespace, plural):
11141114
"kind": "RayCluster",
11151115
"metadata": {
11161116
"labels": {
1117-
"appwrapper.mcad.ibm.com": "quicktest1",
1117+
"workload.codeflare.dev/appwrapper": "quicktest1",
11181118
"controller-tools.k8s.io": "1.0",
11191119
},
11201120
"name": "quicktest1",
@@ -1437,7 +1437,7 @@ def get_aw_obj(group, version, namespace, plural):
14371437
"kind": "RayCluster",
14381438
"metadata": {
14391439
"labels": {
1440-
"appwrapper.mcad.ibm.com": "quicktest2",
1440+
"workload.codeflare.dev/appwrapper": "quicktest2",
14411441
"controller-tools.k8s.io": "1.0",
14421442
},
14431443
"name": "quicktest2",

0 commit comments

Comments
 (0)