Review changes local_interactive

project-codeflare · Mar 28, 2024 · 62519b2 · 62519b2
1 parent ef8e94b
commit 62519b2
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/src/codeflare_sdk/cluster/cluster.py b/src/codeflare_sdk/cluster/cluster.py
@@ -509,7 +509,7 @@ def from_k8_cluster_object(
         openshift_oauth = False
         if (
             rc["metadata"]["annotations"]["sdk.codeflare.dev/local_interactive"]
-            == "true"
+            == "True"
         ):
             local_interactive = True
         else:
@@ -677,7 +677,7 @@ def get_cluster(
             mcad = _check_aw_exists(cluster_name, namespace)
             ingress_host = None
             ingress_options = {}
-            if is_openshift_cluster() == False:
+            if not is_openshift_cluster():
                 try:
                     config_check()
                     api_instance = client.NetworkingV1Api(api_config_handler())

diff --git a/src/codeflare_sdk/templates/base-template.yaml b/src/codeflare_sdk/templates/base-template.yaml
@@ -41,7 +41,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
-            sdk.codeflare.dev/local_interactive: "false"
+            sdk.codeflare.dev/local_interactive: "False"
           labels:
             workload.codeflare.dev/appwrapper: "aw-kuberay"
             controller-tools.k8s.io: "1.0"

diff --git a/src/codeflare_sdk/utils/generate_yaml.py b/src/codeflare_sdk/utils/generate_yaml.py
@@ -463,7 +463,7 @@ def enable_local_interactive(resources, cluster_name, namespace, ingress_domain)
     )
     item["generictemplate"]["metadata"]["annotations"][
         "sdk.codeflare.dev/local_interactive"
-    ] = "true"
+    ] = "True"
     item["generictemplate"]["metadata"]["annotations"][
         "sdk.codeflare.dev/ingress_domain"
     ] = ingress_domain

diff --git a/tests/test-case-bad.yaml b/tests/test-case-bad.yaml
@@ -33,7 +33,7 @@ spec:
         kind: RayCluster
         metadata:
           annotations:
-            sdk.codeflare.dev/local_interactive: 'false'
+            sdk.codeflare.dev/local_interactive: 'False'
           labels:
             workload.codeflare.dev/appwrapper: unit-test-cluster
             controller-tools.k8s.io: '1.0'

diff --git a/tests/test-case-no-mcad.yamls b/tests/test-case-no-mcad.yamls
@@ -4,7 +4,7 @@ kind: RayCluster
 metadata:
   annotations:
     sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
-    sdk.codeflare.dev/local_interactive: 'false'
+    sdk.codeflare.dev/local_interactive: 'False'
   labels:
     controller-tools.k8s.io: '1.0'
     workload.codeflare.dev/appwrapper: unit-test-cluster-ray

diff --git a/tests/test-case-prio.yaml b/tests/test-case-prio.yaml
@@ -34,7 +34,7 @@ spec:
         metadata:
           annotations:
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
-            sdk.codeflare.dev/local_interactive: 'false'
+            sdk.codeflare.dev/local_interactive: 'False'
           labels:
             controller-tools.k8s.io: '1.0'
             workload.codeflare.dev/appwrapper: prio-test-cluster

diff --git a/tests/test-case.yaml b/tests/test-case.yaml
@@ -33,7 +33,7 @@ spec:
         metadata:
           annotations:
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
-            sdk.codeflare.dev/local_interactive: 'false'
+            sdk.codeflare.dev/local_interactive: 'False'
           labels:
             controller-tools.k8s.io: '1.0'
             workload.codeflare.dev/appwrapper: unit-test-cluster

diff --git a/tests/test-default-appwrapper.yaml b/tests/test-default-appwrapper.yaml
@@ -31,7 +31,7 @@ spec:
         metadata:
           annotations:
             sdk.codeflare.dev/ingress_domain: apps.cluster.awsroute.org
-            sdk.codeflare.dev/local_interactive: 'false'
+            sdk.codeflare.dev/local_interactive: 'False'
           labels:
             controller-tools.k8s.io: '1.0'
             workload.codeflare.dev/appwrapper: unit-test-default-cluster

diff --git a/tests/unit_test.py b/tests/unit_test.py
@@ -978,7 +978,7 @@ def get_ray_obj(group, version, namespace, plural, cls=None):
                     "creationTimestamp": "2024-03-05T09:55:37Z",
                     "generation": 1,
                     "annotations": {
-                        "sdk.codeflare.dev/local_interactive": "true",
+                        "sdk.codeflare.dev/local_interactive": "True",
                         "sdk.codeflare.dev/ingress_domain": "apps.cluster.awsroute.org",
                     },
                     "labels": {
@@ -1535,7 +1535,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "annotations": {
-                                            "sdk.codeflare.dev/local_interactive": "false"
+                                            "sdk.codeflare.dev/local_interactive": "False"
                                         },
                                         "labels": {
                                             "workload.codeflare.dev/appwrapper": "quicktest1",
@@ -1866,7 +1866,7 @@ def get_aw_obj(group, version, namespace, plural):
                                     "kind": "RayCluster",
                                     "metadata": {
                                         "annotations": {
-                                            "sdk.codeflare.dev/local_interactive": "false"
+                                            "sdk.codeflare.dev/local_interactive": "False"
                                         },
                                         "labels": {
                                             "workload.codeflare.dev/appwrapper": "quicktest2",
@@ -2138,7 +2138,7 @@ def test_get_cluster_openshift(mocker):
     ]
     mocker.patch("kubernetes.client.ApisApi", return_value=mock_api)
 
-    assert is_openshift_cluster() == True
+    assert is_openshift_cluster()
 
     def custom_side_effect(group, version, namespace, plural, **kwargs):
         if plural == "routes":