File tree Expand file tree Collapse file tree 1 file changed +23
-8
lines changed
src/codeflare_sdk/cluster Expand file tree Collapse file tree 1 file changed +23
-8
lines changed Original file line number Diff line number Diff line change @@ -633,14 +633,29 @@ def get_current_namespace(): # pragma: no cover
633633 print ("Unable to find current namespace" )
634634 return None
635635 else :
636- try :
637- _ , active_context = config .list_kube_config_contexts (config_check ())
638- except Exception as e :
639- return _kube_api_error_handling (e )
640- try :
641- return active_context ["context" ]["namespace" ]
642- except KeyError :
643- return None
636+ if "KUBERNETES_PORT" in os .environ :
637+ if os .path .isfile (
638+ "/var/run/secrets/kubernetes.io/serviceaccount/namespace"
639+ ):
640+ try :
641+ file = open (
642+ "/var/run/secrets/kubernetes.io/serviceaccount/namespace" , "r"
643+ )
644+ active_context = file .readline ().strip ("\n " )
645+ return active_context
646+ except Exception as e :
647+ print (
648+ "unable to gather namespace from /var/run/secrets/kubernetes.io/serviceaccount/namespace trying to gather from current context"
649+ )
650+ else :
651+ try :
652+ _ , active_context = config .list_kube_config_contexts (config_check ())
653+ except Exception as e :
654+ return _kube_api_error_handling (e )
655+ try :
656+ return active_context ["context" ]["namespace" ]
657+ except KeyError :
658+ return None
644659
645660
646661def get_cluster (
You can’t perform that action at this time.
0 commit comments