Skip to content

Commit 62519b2

Browse files
Review changes local_interactive
1 parent ef8e94b commit 62519b2

9 files changed

+13
-13
lines changed

src/codeflare_sdk/cluster/cluster.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ def from_k8_cluster_object(
509509
openshift_oauth = False
510510
if (
511511
rc["metadata"]["annotations"]["sdk.codeflare.dev/local_interactive"]
512-
== "true"
512+
== "True"
513513
):
514514
local_interactive = True
515515
else:
@@ -677,7 +677,7 @@ def get_cluster(
677677
mcad = _check_aw_exists(cluster_name, namespace)
678678
ingress_host = None
679679
ingress_options = {}
680-
if is_openshift_cluster() == False:
680+
if not is_openshift_cluster():
681681
try:
682682
config_check()
683683
api_instance = client.NetworkingV1Api(api_config_handler())

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
annotations:
44-
sdk.codeflare.dev/local_interactive: "false"
44+
sdk.codeflare.dev/local_interactive: "False"
4545
labels:
4646
workload.codeflare.dev/appwrapper: "aw-kuberay"
4747
controller-tools.k8s.io: "1.0"

src/codeflare_sdk/utils/generate_yaml.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
463463
)
464464
item["generictemplate"]["metadata"]["annotations"][
465465
"sdk.codeflare.dev/local_interactive"
466-
] = "true"
466+
] = "True"
467467
item["generictemplate"]["metadata"]["annotations"][
468468
"sdk.codeflare.dev/ingress_domain"
469469
] = ingress_domain

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
annotations:
36-
sdk.codeflare.dev/local_interactive: 'false'
36+
sdk.codeflare.dev/local_interactive: 'False'
3737
labels:
3838
workload.codeflare.dev/appwrapper: unit-test-cluster
3939
controller-tools.k8s.io: '1.0'

tests/test-case-no-mcad.yamls

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ kind: RayCluster
44
metadata:
55
annotations:
66
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
7-
sdk.codeflare.dev/local_interactive: 'false'
7+
sdk.codeflare.dev/local_interactive: 'False'
88
labels:
99
controller-tools.k8s.io: '1.0'
1010
workload.codeflare.dev/appwrapper: unit-test-cluster-ray

tests/test-case-prio.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
metadata:
3535
annotations:
3636
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
37-
sdk.codeflare.dev/local_interactive: 'false'
37+
sdk.codeflare.dev/local_interactive: 'False'
3838
labels:
3939
controller-tools.k8s.io: '1.0'
4040
workload.codeflare.dev/appwrapper: prio-test-cluster

tests/test-case.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
metadata:
3434
annotations:
3535
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
36-
sdk.codeflare.dev/local_interactive: 'false'
36+
sdk.codeflare.dev/local_interactive: 'False'
3737
labels:
3838
controller-tools.k8s.io: '1.0'
3939
workload.codeflare.dev/appwrapper: unit-test-cluster

tests/test-default-appwrapper.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
metadata:
3232
annotations:
3333
sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
34-
sdk.codeflare.dev/local_interactive: 'false'
34+
sdk.codeflare.dev/local_interactive: 'False'
3535
labels:
3636
controller-tools.k8s.io: '1.0'
3737
workload.codeflare.dev/appwrapper: unit-test-default-cluster

tests/unit_test.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
978978
"creationTimestamp": "2024-03-05T09:55:37Z",
979979
"generation": 1,
980980
"annotations": {
981-
"sdk.codeflare.dev/local_interactive": "true",
981+
"sdk.codeflare.dev/local_interactive": "True",
982982
"sdk.codeflare.dev/ingress_domain": "apps.cluster.awsroute.org",
983983
},
984984
"labels": {
@@ -1535,7 +1535,7 @@ def get_aw_obj(group, version, namespace, plural):
15351535
"kind": "RayCluster",
15361536
"metadata": {
15371537
"annotations": {
1538-
"sdk.codeflare.dev/local_interactive": "false"
1538+
"sdk.codeflare.dev/local_interactive": "False"
15391539
},
15401540
"labels": {
15411541
"workload.codeflare.dev/appwrapper": "quicktest1",
@@ -1866,7 +1866,7 @@ def get_aw_obj(group, version, namespace, plural):
18661866
"kind": "RayCluster",
18671867
"metadata": {
18681868
"annotations": {
1869-
"sdk.codeflare.dev/local_interactive": "false"
1869+
"sdk.codeflare.dev/local_interactive": "False"
18701870
},
18711871
"labels": {
18721872
"workload.codeflare.dev/appwrapper": "quicktest2",
@@ -2138,7 +2138,7 @@ def test_get_cluster_openshift(mocker):
21382138
]
21392139
mocker.patch("kubernetes.client.ApisApi", return_value=mock_api)
21402140

2141-
assert is_openshift_cluster() == True
2141+
assert is_openshift_cluster()
21422142

21432143
def custom_side_effect(group, version, namespace, plural, **kwargs):
21442144
if plural == "routes":

0 commit comments

Comments
 (0)