Skip to content

Commit ee900d9

Browse files
committed
remove repeated conditional branch logic
Signed-off-by: Kevin <[email protected]>
1 parent 6e895a8 commit ee900d9

File tree

1 file changed

+18
-34
lines changed

1 file changed

+18
-34
lines changed

src/codeflare_sdk/cluster/cluster.py

+18-34
Original file line numberDiff line numberDiff line change
@@ -546,41 +546,25 @@ def list_all_queued(
546546

547547

548548
def get_current_namespace(): # pragma: no cover
549-
if api_config_handler() != None:
550-
if os.path.isfile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"):
551-
try:
552-
file = open(
553-
"/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r"
554-
)
555-
active_context = file.readline().strip("\n")
556-
return active_context
557-
except Exception as e:
558-
print("Unable to find current namespace")
559-
return None
560-
else:
549+
if os.path.isfile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"):
550+
try:
551+
file = open("/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r")
552+
active_context = file.readline().strip("\n")
553+
return active_context
554+
except Exception as e:
561555
print("Unable to find current namespace")
562-
return None
563-
else:
564-
if os.path.isfile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"):
565-
try:
566-
file = open(
567-
"/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r"
568-
)
569-
active_context = file.readline().strip("\n")
570-
return active_context
571-
except Exception as e:
572-
print(
573-
"unable to gather namespace from /var/run/secrets/kubernetes.io/serviceaccount/namespace trying to gather from current context"
574-
)
575-
else:
576-
try:
577-
_, active_context = config.list_kube_config_contexts(config_check())
578-
except Exception as e:
579-
return _kube_api_error_handling(e)
580-
try:
581-
return active_context["context"]["namespace"]
582-
except KeyError:
583-
return None
556+
557+
if api_config_handler() != None:
558+
return None
559+
print("trying to gather from current context")
560+
try:
561+
_, active_context = config.list_kube_config_contexts(config_check())
562+
except Exception as e:
563+
return _kube_api_error_handling(e)
564+
try:
565+
return active_context["context"]["namespace"]
566+
except KeyError:
567+
return None
584568

585569

586570
def get_cluster(

0 commit comments

Comments
 (0)