Made handler functions generic and altered get_current_namespace() functionality

Author: Bobbins228

src/codeflare_sdk/cluster/auth.py

@@ -59,12 +59,6 @@ def load_kube_config(self):
         """
         pass
 
-    def config_check(self):
-        """
-        Method for checking if a user is authenticated via token and server or with their own config file
-        """
-        pass
-
     def logout(self):
         """
         Method for logging out of the remote cluster
@@ -118,15 +112,6 @@ def login(self) -> str:
         except client.ApiException as exception:
             return exception
 
-    def api_config_handler() -> str:
-        """
-        This function is used to load the api client if the user has logged in
-        """
-        if api_client != None and config_path == None:
-            return api_client
-        else:
-            return None
-
     def logout(self) -> str:
         """
         This function is used to logout of a Kubernetes cluster.
@@ -165,14 +150,25 @@ def load_kube_config(self):
             raise Exception("Please specify a config file path")
         return response
 
-    def config_check() -> str:
-        """
-        Function for loading the config file at the default config location ~/.kube/config if the user has not
-        specified their own config file or has logged in with their token and server.
-        """
-        global config_path
-        global api_client
-        if config_path == None and api_client == None:
-            config.load_kube_config()
-        if config_path != None and api_client == None:
-            return config_path
+
+def config_check() -> str:
+    """
+    Function for loading the config file at the default config location ~/.kube/config if the user has not
+    specified their own config file or has logged in with their token and server.
+    """
+    global config_path
+    global api_client
+    if config_path == None and api_client == None:
+        config.load_kube_config()
+    if config_path != None and api_client == None:
+        return config_path
+
+
+def api_config_handler() -> str:
+    """
+    This function is used to load the api client if the user has logged in
+    """
+    if api_client != None and config_path == None:
+        return api_client
+    else:
+        return None

src/codeflare_sdk/cluster/awload.py

@@ -24,7 +24,7 @@
 
 from kubernetes import client, config
 from ..utils.kube_api_helpers import _kube_api_error_handling
-from .auth import KubeConfigFileAuthentication, TokenAuthentication
+from .auth import config_check, api_config_handler
 
 
 class AWManager:
@@ -58,10 +58,8 @@ def submit(self) -> None:
         Attempts to create the AppWrapper custom resource using the yaml file
         """
         try:
-            KubeConfigFileAuthentication.config_check()
-            api_instance = client.CustomObjectsApi(
-                TokenAuthentication.api_config_handler()
-            )
+            config_check()
+            api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.create_namespaced_custom_object(
                 group="mcad.ibm.com",
                 version="v1beta1",
@@ -85,10 +83,8 @@ def remove(self) -> None:
             return
 
         try:
-            KubeConfigFileAuthentication.config_check()
-            api_instance = client.CustomObjectsApi(
-                TokenAuthentication.api_config_handler()
-            )
+            config_check()
+            api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.delete_namespaced_custom_object(
                 group="mcad.ibm.com",
                 version="v1beta1",

src/codeflare_sdk/cluster/cluster.py

@@ -23,7 +23,7 @@
 
 from ray.job_submission import JobSubmissionClient
 
-from .auth import KubeConfigFileAuthentication, TokenAuthentication
+from .auth import config_check, api_config_handler
 from ..utils import pretty_print
 from ..utils.generate_yaml import generate_appwrapper
 from ..utils.kube_api_helpers import _kube_api_error_handling
@@ -69,7 +69,11 @@ def create_app_wrapper(self):
 
         if self.config.namespace is None:
             self.config.namespace = get_current_namespace()
-            if type(self.config.namespace) is not str:
+            if self.config.namespace is None:
+                print(
+                    "Unable to find current namespace please specify with namespace=<your_current_namespace>"
+                )
+            elif type(self.config.namespace) is not str:
                 raise TypeError(
                     f"Namespace {self.config.namespace} is of type {type(self.config.namespace)}. Check your Kubernetes Authentication."
                 )
@@ -115,10 +119,8 @@ def up(self):
         """
         namespace = self.config.namespace
         try:
-            KubeConfigFileAuthentication.config_check()
-            api_instance = client.CustomObjectsApi(
-                TokenAuthentication.api_config_handler()
-            )
+            config_check()
+            api_instance = client.CustomObjectsApi(api_config_handler())
             with open(self.app_wrapper_yaml) as f:
                 aw = yaml.load(f, Loader=yaml.FullLoader)
             api_instance.create_namespaced_custom_object(
@@ -138,10 +140,8 @@ def down(self):
         """
         namespace = self.config.namespace
         try:
-            KubeConfigFileAuthentication.config_check()
-            api_instance = client.CustomObjectsApi(
-                TokenAuthentication.api_config_handler()
-            )
+            config_check()
+            api_instance = client.CustomObjectsApi(api_config_handler())
             api_instance.delete_namespaced_custom_object(
                 group="mcad.ibm.com",
                 version="v1beta1",
@@ -252,10 +252,8 @@ def cluster_dashboard_uri(self) -> str:
         Returns a string containing the cluster's dashboard URI.
         """
         try:
-            KubeConfigFileAuthentication.config_check()
-            api_instance = client.CustomObjectsApi(
-                TokenAuthentication.api_config_handler()
-            )
+            config_check()
+            api_instance = client.CustomObjectsApi(api_config_handler())
             routes = api_instance.list_namespaced_custom_object(
                 group="route.openshift.io",
                 version="v1",
@@ -383,8 +381,7 @@ def list_all_queued(namespace: str, print_to_console: bool = True):
 
 
 def get_current_namespace():  # pragma: no cover
-    namespace_error = "Unable to find current namespace please specify with namespace=<your_current_namespace>"
-    if TokenAuthentication.api_config_handler() != None:
+    if api_config_handler() != None:
         if os.path.isfile("/var/run/secrets/kubernetes.io/serviceaccount/namespace"):
             try:
                 file = open(
@@ -393,21 +390,20 @@ def get_current_namespace():  # pragma: no cover
                 active_context = file.readline().strip("\n")
                 return active_context
             except Exception as e:
-                return namespace_error
+                print("Unable to find current namespace")
+                return None
         else:
-            return namespace_error
+            print("Unable to find current namespace")
+            return None
     else:
         try:
-            # KubeConfigFileAuthentication.config_check()
-            _, active_context = config.list_kube_config_contexts(
-                KubeConfigFileAuthentication.config_check()
-            )
+            _, active_context = config.list_kube_config_contexts(config_check())
         except Exception as e:
             return _kube_api_error_handling(e)
         try:
             return active_context["context"]["namespace"]
         except KeyError:
-            return namespace_error
+            return None
 
 
 def get_cluster(cluster_name: str, namespace: str = "default"):
@@ -446,8 +442,8 @@ def _get_ingress_domain():
 
 def _app_wrapper_status(name, namespace="default") -> Optional[AppWrapper]:
     try:
-        KubeConfigFileAuthentication.config_check()
-        api_instance = client.CustomObjectsApi(TokenAuthentication.api_config_handler())
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         aws = api_instance.list_namespaced_custom_object(
             group="mcad.ibm.com",
             version="v1beta1",
@@ -465,8 +461,8 @@ def _app_wrapper_status(name, namespace="default") -> Optional[AppWrapper]:
 
 def _ray_cluster_status(name, namespace="default") -> Optional[RayCluster]:
     try:
-        KubeConfigFileAuthentication.config_check()
-        api_instance = client.CustomObjectsApi(TokenAuthentication.api_config_handler())
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group="ray.io",
             version="v1alpha1",
@@ -485,8 +481,8 @@ def _ray_cluster_status(name, namespace="default") -> Optional[RayCluster]:
 def _get_ray_clusters(namespace="default") -> List[RayCluster]:
     list_of_clusters = []
     try:
-        KubeConfigFileAuthentication.config_check()
-        api_instance = client.CustomObjectsApi(TokenAuthentication.api_config_handler())
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         rcs = api_instance.list_namespaced_custom_object(
             group="ray.io",
             version="v1alpha1",
@@ -507,8 +503,8 @@ def _get_app_wrappers(
     list_of_app_wrappers = []
 
     try:
-        KubeConfigFileAuthentication.config_check()
-        api_instance = client.CustomObjectsApi(TokenAuthentication.api_config_handler())
+        config_check()
+        api_instance = client.CustomObjectsApi(api_config_handler())
         aws = api_instance.list_namespaced_custom_object(
             group="mcad.ibm.com",
             version="v1beta1",
@@ -534,8 +530,8 @@ def _map_to_ray_cluster(rc) -> Optional[RayCluster]:
     else:
         status = RayClusterStatus.UNKNOWN
 
-    KubeConfigFileAuthentication.config_check()
-    api_instance = client.CustomObjectsApi(TokenAuthentication.api_config_handler())
+    config_check()
+    api_instance = client.CustomObjectsApi(api_config_handler())
     routes = api_instance.list_namespaced_custom_object(
         group="route.openshift.io",
         version="v1",

src/codeflare_sdk/utils/generate_cert.py

@@ -19,7 +19,7 @@
 from cryptography import x509
 from cryptography.x509.oid import NameOID
 import datetime
-from ..cluster.auth import KubeConfigFileAuthentication, TokenAuthentication
+from ..cluster.auth import config_check, api_config_handler
 from kubernetes import client, config
 
 
@@ -83,8 +83,8 @@ def generate_tls_cert(cluster_name, namespace, days=30):
     # Similar to:
     # oc get secret ca-secret-<cluster-name> -o template='{{index .data "ca.key"}}'
     # oc get secret ca-secret-<cluster-name> -o template='{{index .data "ca.crt"}}'|base64 -d > ${TLSDIR}/ca.crt
-    KubeConfigFileAuthentication.config_check()
-    v1 = client.CoreV1Api(TokenAuthentication.api_config_handler())
+    config_check()
+    v1 = client.CoreV1Api(api_config_handler())
     secret = v1.read_namespaced_secret(f"ca-secret-{cluster_name}", namespace).data
     ca_cert = secret.get("ca.crt")
     ca_key = secret.get("ca.key")