@@ -560,41 +560,25 @@ def list_all_queued(
560
560
561
561
562
562
def get_current_namespace (): # pragma: no cover
563
- if api_config_handler () != None :
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 ("Unable to find current namespace" )
573
- return None
574
- else :
563
+ if os .path .isfile ("/var/run/secrets/kubernetes.io/serviceaccount/namespace" ):
564
+ try :
565
+ file = open ("/var/run/secrets/kubernetes.io/serviceaccount/namespace" , "r" )
566
+ active_context = file .readline ().strip ("\n " )
567
+ return active_context
568
+ except Exception as e :
575
569
print ("Unable to find current namespace" )
576
- return None
577
- else :
578
- if os .path .isfile ("/var/run/secrets/kubernetes.io/serviceaccount/namespace" ):
579
- try :
580
- file = open (
581
- "/var/run/secrets/kubernetes.io/serviceaccount/namespace" , "r"
582
- )
583
- active_context = file .readline ().strip ("\n " )
584
- return active_context
585
- except Exception as e :
586
- print (
587
- "unable to gather namespace from /var/run/secrets/kubernetes.io/serviceaccount/namespace trying to gather from current context"
588
- )
589
- else :
590
- try :
591
- _ , active_context = config .list_kube_config_contexts (config_check ())
592
- except Exception as e :
593
- return _kube_api_error_handling (e )
594
- try :
595
- return active_context ["context" ]["namespace" ]
596
- except KeyError :
597
- return None
570
+
571
+ if api_config_handler () != None :
572
+ return None
573
+ print ("trying to gather from current context" )
574
+ try :
575
+ _ , active_context = config .list_kube_config_contexts (config_check ())
576
+ except Exception as e :
577
+ return _kube_api_error_handling (e )
578
+ try :
579
+ return active_context ["context" ]["namespace" ]
580
+ except KeyError :
581
+ return None
598
582
599
583
600
584
def get_cluster (
0 commit comments