@@ -546,41 +546,27 @@ def list_all_queued(
546
546
547
547
548
548
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 (
552
+ "/var/run/secrets/kubernetes.io/serviceaccount/namespace" , "r"
553
+ )
554
+ active_context = file .readline ().strip ("\n " )
555
+ return active_context
556
+ except Exception as e :
561
557
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
558
+
559
+ if api_config_handler () != None :
560
+ return None
561
+ print ("trying to gather from current context" )
562
+ try :
563
+ _ , active_context = config .list_kube_config_contexts (config_check ())
564
+ except Exception as e :
565
+ return _kube_api_error_handling (e )
566
+ try :
567
+ return active_context ["context" ]["namespace" ]
568
+ except KeyError :
569
+ return None
584
570
585
571
586
572
def get_cluster (
0 commit comments