X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=808201d23fa92dadcd1ec9d417352328fafbafb4;hp=3316087d975889111ea4166a719babfee9472110;hb=2c791b34626ff76ab1886a110599998f9de0df80;hpb=45d9577cb2f06a73f63c8329a0893ba419f30f41 diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 3316087..808201d 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -14,36 +14,32 @@ import asyncio import concurrent -from .exceptions import NotImplemented +import os +import uuid +import yaml -import io import juju -# from juju.bundle import BundleHandler from juju.controller import Controller from juju.model import Model -from juju.errors import JujuAPIError, JujuError - +from n2vc.exceptions import K8sException from n2vc.k8s_conn import K8sConnector +from n2vc.kubectl import Kubectl +from .exceptions import MethodNotImplemented -import os + +# from juju.bundle import BundleHandler # import re # import ssl # from .vnf import N2VC - -import uuid -import yaml - - class K8sJujuConnector(K8sConnector): - def __init__( - self, - fs: object, - db: object, - kubectl_command: str = '/usr/bin/kubectl', - juju_command: str = '/usr/bin/juju', - log: object = None, - on_update_db=None, + self, + fs: object, + db: object, + kubectl_command: str = "/usr/bin/kubectl", + juju_command: str = "/usr/bin/juju", + log: object = None, + on_update_db=None, ): """ @@ -55,14 +51,11 @@ class K8sJujuConnector(K8sConnector): # parent class K8sConnector.__init__( - self, - db, - log=log, - on_update_db=on_update_db, + self, db, log=log, on_update_db=on_update_db, ) self.fs = fs - self.log.debug('Initializing K8S Juju connector') + self.log.debug("Initializing K8S Juju connector") self.authenticated = False self.models = {} @@ -70,23 +63,27 @@ class K8sJujuConnector(K8sConnector): self.juju_command = juju_command self.juju_secret = "" - self.log.debug('K8S Juju connector initialized') + self.log.debug("K8S Juju connector initialized") """Initialization""" + async def init_env( self, k8s_creds: str, - namespace: str = 'kube-system', + namespace: str = "kube-system", reuse_cluster_uuid: str = None, ) -> (str, bool): """ It prepares a given K8s cluster environment to run Juju bundles. - :param k8s_creds: credentials to access a given K8s cluster, i.e. a valid '.kube/config' - :param namespace: optional namespace to be used for juju. By default, 'kube-system' will be used + :param k8s_creds: credentials to access a given K8s cluster, i.e. a valid + '.kube/config' + :param namespace: optional namespace to be used for juju. By default, + 'kube-system' will be used :param reuse_cluster_uuid: existing cluster uuid for reuse - :return: uuid of the K8s cluster and True if connector has installed some software in the cluster - (on error, an exception will be raised) + :return: uuid of the K8s cluster and True if connector has installed some + software in the cluster + (on error, an exception will be raised) """ """Bootstrapping @@ -127,135 +124,110 @@ class K8sJujuConnector(K8sConnector): # reuse_cluster_uuid, e.g. to try to fix it. # ################################################### - if not reuse_cluster_uuid: - # This is a new cluster, so bootstrap it - - cluster_uuid = str(uuid.uuid4()) - - # Is a local k8s cluster? - localk8s = self.is_local_k8s(k8s_creds) - - # If the k8s is external, the juju controller needs a loadbalancer - loadbalancer = False if localk8s else True - - # Name the new k8s cloud - k8s_cloud = "k8s-{}".format(cluster_uuid) - - self.log.debug("Adding k8s cloud {}".format(k8s_cloud)) - await self.add_k8s(k8s_cloud, k8s_creds) - - # Bootstrap Juju controller - self.log.debug("Bootstrapping...") - await self.bootstrap(k8s_cloud, cluster_uuid, loadbalancer) - self.log.debug("Bootstrap done.") - - # Get the controller information - - # Parse ~/.local/share/juju/controllers.yaml - # controllers.testing.api-endpoints|ca-cert|uuid - self.log.debug("Getting controller endpoints") - with open(os.path.expanduser( - "~/.local/share/juju/controllers.yaml" - )) as f: - controllers = yaml.load(f, Loader=yaml.Loader) - controller = controllers['controllers'][cluster_uuid] - endpoints = controller['api-endpoints'] - self.juju_endpoint = endpoints[0] - self.juju_ca_cert = controller['ca-cert'] - - # Parse ~/.local/share/juju/accounts - # controllers.testing.user|password - self.log.debug("Getting accounts") - with open(os.path.expanduser( - "~/.local/share/juju/accounts.yaml" - )) as f: - controllers = yaml.load(f, Loader=yaml.Loader) - controller = controllers['controllers'][cluster_uuid] - - self.juju_user = controller['user'] - self.juju_secret = controller['password'] - - # raise Exception("EOL") - - self.juju_public_key = None - - config = { - 'endpoint': self.juju_endpoint, - 'username': self.juju_user, - 'secret': self.juju_secret, - 'cacert': self.juju_ca_cert, - 'namespace': namespace, - 'loadbalancer': loadbalancer, - } + # This is a new cluster, so bootstrap it - # Store the cluster configuration so it - # can be used for subsequent calls - self.log.debug("Setting config") - await self.set_config(cluster_uuid, config) + cluster_uuid = reuse_cluster_uuid or str(uuid.uuid4()) - else: - # This is an existing cluster, so get its config - cluster_uuid = reuse_cluster_uuid + # Is a local k8s cluster? + localk8s = self.is_local_k8s(k8s_creds) + + # If the k8s is external, the juju controller needs a loadbalancer + loadbalancer = False if localk8s else True + + # Name the new k8s cloud + k8s_cloud = "k8s-{}".format(cluster_uuid) - config = self.get_config(cluster_uuid) + self.log.debug("Adding k8s cloud {}".format(k8s_cloud)) + await self.add_k8s(k8s_cloud, k8s_creds) - self.juju_endpoint = config['endpoint'] - self.juju_user = config['username'] - self.juju_secret = config['secret'] - self.juju_ca_cert = config['cacert'] - self.juju_public_key = None + # Bootstrap Juju controller + self.log.debug("Bootstrapping...") + await self.bootstrap(k8s_cloud, cluster_uuid, loadbalancer) + self.log.debug("Bootstrap done.") + + # Get the controller information + + # Parse ~/.local/share/juju/controllers.yaml + # controllers.testing.api-endpoints|ca-cert|uuid + self.log.debug("Getting controller endpoints") + with open(os.path.expanduser("~/.local/share/juju/controllers.yaml")) as f: + controllers = yaml.load(f, Loader=yaml.Loader) + controller = controllers["controllers"][cluster_uuid] + endpoints = controller["api-endpoints"] + self.juju_endpoint = endpoints[0] + self.juju_ca_cert = controller["ca-cert"] + + # Parse ~/.local/share/juju/accounts + # controllers.testing.user|password + self.log.debug("Getting accounts") + with open(os.path.expanduser("~/.local/share/juju/accounts.yaml")) as f: + controllers = yaml.load(f, Loader=yaml.Loader) + controller = controllers["controllers"][cluster_uuid] + + self.juju_user = controller["user"] + self.juju_secret = controller["password"] + + # raise Exception("EOL") + + self.juju_public_key = None + + config = { + "endpoint": self.juju_endpoint, + "username": self.juju_user, + "secret": self.juju_secret, + "cacert": self.juju_ca_cert, + "namespace": namespace, + "loadbalancer": loadbalancer, + } + + # Store the cluster configuration so it + # can be used for subsequent calls + self.log.debug("Setting config") + await self.set_config(cluster_uuid, config) # Login to the k8s cluster if not self.authenticated: await self.login(cluster_uuid) # We're creating a new cluster - #print("Getting model {}".format(self.get_namespace(cluster_uuid), cluster_uuid=cluster_uuid)) - #model = await self.get_model( + # print("Getting model {}".format(self.get_namespace(cluster_uuid), + # cluster_uuid=cluster_uuid)) + # model = await self.get_model( # self.get_namespace(cluster_uuid), # cluster_uuid=cluster_uuid - #) + # ) - ## Disconnect from the model - #if model and model.is_connected(): + # Disconnect from the model + # if model and model.is_connected(): # await model.disconnect() return cluster_uuid, True """Repo Management""" + async def repo_add( - self, - name: str, - url: str, - type: str = "charm", + self, name: str, url: str, _type: str = "charm", ): - raise NotImplemented() + raise MethodNotImplemented() async def repo_list(self): - raise NotImplemented() + raise MethodNotImplemented() async def repo_remove( - self, - name: str, + self, name: str, ): - raise NotImplemented() + raise MethodNotImplemented() - async def synchronize_repos( - self, - cluster_uuid: str, - name: str - ): + async def synchronize_repos(self, cluster_uuid: str, name: str): """ Returns None as currently add_repo is not implemented """ return None """Reset""" + async def reset( - self, - cluster_uuid: str, - force: bool = False, - uninstall_sw: bool = False + self, cluster_uuid: str, force: bool = False, uninstall_sw: bool = False ) -> bool: """Reset a cluster @@ -274,10 +246,7 @@ class K8sJujuConnector(K8sConnector): namespace = self.get_namespace(cluster_uuid) if await self.has_model(namespace): self.log.debug("[reset] Destroying model") - await self.controller.destroy_model( - namespace, - destroy_storage=True - ) + await self.controller.destroy_model(namespace, destroy_storage=True) # Disconnect from the controller self.log.debug("[reset] Disconnecting controller") @@ -306,7 +275,8 @@ class K8sJujuConnector(K8sConnector): timeout: float = 300, params: dict = None, db_dict: dict = None, - kdu_name: str = None + kdu_name: str = None, + namespace: str = None, ) -> bool: """Install a bundle @@ -318,6 +288,7 @@ class K8sJujuConnector(K8sConnector): to finish :param params dict: Key-value pairs of instantiation parameters :param kdu_name: Name of the KDU instance to be installed + :param namespace: K8s namespace to use for the KDU instance :return: If successful, returns ? """ @@ -347,11 +318,14 @@ class K8sJujuConnector(K8sConnector): "Juju bundle that models the KDU, in any of the following ways: - / - - - + - - """ - - previous_workdir = os.getcwd() + try: + previous_workdir = os.getcwd() + except FileNotFoundError: + previous_workdir = "/app/storage" bundle = kdu_model if kdu_model.startswith("cs:"): @@ -386,16 +360,16 @@ class K8sJujuConnector(K8sConnector): self.log.debug("Waiting for all units to be active...") await model.block_until( lambda: all( - unit.agent_status == 'idle' - and application.status in ['active', 'unknown'] - and unit.workload_status in [ - 'active', 'unknown' - ] for unit in application.units + unit.agent_status == "idle" + and application.status in ["active", "unknown"] + and unit.workload_status in ["active", "unknown"] + for unit in application.units ), - timeout=timeout + timeout=timeout, ) self.log.debug("All units active.") + # TODO use asyncio.TimeoutError except concurrent.futures._base.TimeoutError: os.chdir(previous_workdir) self.log.debug("[install] Timeout exceeded; resetting cluster") @@ -412,10 +386,7 @@ class K8sJujuConnector(K8sConnector): return kdu_instance raise Exception("Unable to install") - async def instances_list( - self, - cluster_uuid: str - ) -> list: + async def instances_list(self, cluster_uuid: str) -> list: """ returns a list of deployed releases in a cluster @@ -458,7 +429,7 @@ class K8sJujuConnector(K8sConnector): namespace = self.get_namespace(cluster_uuid) model = await self.get_model(namespace, cluster_uuid=cluster_uuid) - with open(kdu_model, 'r') as f: + with open(kdu_model, "r") as f: bundle = yaml.safe_load(f) """ @@ -480,31 +451,29 @@ class K8sJujuConnector(K8sConnector): } """ # TODO: This should be returned in an agreed-upon format - for name in bundle['applications']: + for name in bundle["applications"]: self.log.debug(model.applications) application = model.applications[name] self.log.debug(application) - path = bundle['applications'][name]['charm'] + path = bundle["applications"][name]["charm"] try: await application.upgrade_charm(switch=path) except juju.errors.JujuError as ex: - if 'already running charm' in str(ex): + if "already running charm" in str(ex): # We're already running this version pass await model.disconnect() return True - raise NotImplemented() + raise MethodNotImplemented() """Rollback""" + async def rollback( - self, - cluster_uuid: str, - kdu_instance: str, - revision: int = 0, + self, cluster_uuid: str, kdu_instance: str, revision: int = 0, ) -> str: """Rollback a model @@ -516,14 +485,11 @@ class K8sJujuConnector(K8sConnector): :return: If successful, returns the revision of active KDU instance, or raises an exception """ - raise NotImplemented() + raise MethodNotImplemented() """Deletion""" - async def uninstall( - self, - cluster_uuid: str, - kdu_instance: str - ) -> bool: + + async def uninstall(self, cluster_uuid: str, kdu_instance: str) -> bool: """Uninstall a KDU instance :param cluster_uuid str: The UUID of the cluster @@ -544,11 +510,84 @@ class K8sJujuConnector(K8sConnector): return True - """Introspection""" - async def inspect_kdu( + async def exec_primitive( self, - kdu_model: str, - ) -> dict: + cluster_uuid: str = None, + kdu_instance: str = None, + primitive_name: str = None, + timeout: float = 300, + params: dict = None, + db_dict: dict = None, + ) -> str: + """Exec primitive (Juju action) + + :param cluster_uuid str: The UUID of the cluster + :param kdu_instance str: The unique name of the KDU instance + :param primitive_name: Name of action that will be executed + :param timeout: Timeout for action execution + :param params: Dictionary of all the parameters needed for the action + :db_dict: Dictionary for any additional data + + :return: Returns the output of the action + """ + if not self.authenticated: + self.log.debug("[exec_primitive] Connecting to controller") + await self.login(cluster_uuid) + + if not params or "application-name" not in params: + raise K8sException( + "Missing application-name argument, \ + argument needed for K8s actions" + ) + try: + self.log.debug( + "[exec_primitive] Getting model " + "kdu_instance: {}".format(kdu_instance) + ) + + model = await self.get_model(kdu_instance, cluster_uuid) + + application_name = params["application-name"] + application = model.applications[application_name] + + actions = await application.get_actions() + if primitive_name not in actions: + raise K8sException("Primitive {} not found".format(primitive_name)) + + unit = None + for u in application.units: + if await u.is_leader_from_status(): + unit = u + break + + if unit is None: + raise K8sException("No leader unit found to execute action") + + self.log.debug("[exec_primitive] Running action: {}".format(primitive_name)) + action = await unit.run_action(primitive_name, **params) + + output = await model.get_action_output(action_uuid=action.entity_id) + status = await model.get_action_status(uuid_or_prefix=action.entity_id) + + status = ( + status[action.entity_id] if action.entity_id in status else "failed" + ) + + if status != "completed": + raise K8sException( + "status is not completed: {} output: {}".format(status, output) + ) + + return output + + except Exception as e: + error_msg = "Error executing primitive {}: {}".format(primitive_name, e) + self.log.error(error_msg) + raise K8sException(message=error_msg) + + """Introspection""" + + async def inspect_kdu(self, kdu_model: str,) -> dict: """Inspect a KDU Inspects a bundle and returns a dictionary of config parameters and @@ -561,7 +600,7 @@ class K8sJujuConnector(K8sConnector): """ kdu = {} - with open(kdu_model, 'r') as f: + with open(kdu_model, "r") as f: bundle = yaml.safe_load(f) """ @@ -583,14 +622,11 @@ class K8sJujuConnector(K8sConnector): } """ # TODO: This should be returned in an agreed-upon format - kdu = bundle['applications'] + kdu = bundle["applications"] return kdu - async def help_kdu( - self, - kdu_model: str, - ) -> str: + async def help_kdu(self, kdu_model: str,) -> str: """View the README If available, returns the README of the bundle. @@ -601,21 +637,17 @@ class K8sJujuConnector(K8sConnector): """ readme = None - files = ['README', 'README.txt', 'README.md'] + files = ["README", "README.txt", "README.md"] path = os.path.dirname(kdu_model) for file in os.listdir(path): if file in files: - with open(file, 'r') as f: + with open(file, "r") as f: readme = f.read() break return readme - async def status_kdu( - self, - cluster_uuid: str, - kdu_instance: str, - ) -> dict: + async def status_kdu(self, cluster_uuid: str, kdu_instance: str,) -> dict: """Get the status of the KDU Get the current status of the KDU instance. @@ -628,7 +660,9 @@ class K8sJujuConnector(K8sConnector): """ status = {} - model = await self.get_model(self.get_namespace(cluster_uuid), cluster_uuid=cluster_uuid) + model = await self.get_model( + self.get_namespace(cluster_uuid), cluster_uuid=cluster_uuid + ) # model = await self.get_model_by_uuid(cluster_uuid) if model: @@ -637,21 +671,58 @@ class K8sJujuConnector(K8sConnector): for name in model_status.applications: application = model_status.applications[name] - status[name] = { - 'status': application['status']['status'] - } + status[name] = {"status": application["status"]["status"]} if model.is_connected(): await model.disconnect() return status + async def get_services( + self, cluster_uuid: str, kdu_instance: str, namespace: str + ) -> list: + """Return a list of services of a kdu_instance""" + + credentials = self.get_credentials(cluster_uuid=cluster_uuid) + + config_path = "/tmp/{}".format(cluster_uuid) + config_file = "{}/config".format(config_path) + + if not os.path.exists(config_path): + os.makedirs(config_path) + with open(config_file, "w") as f: + f.write(credentials) + + kubectl = Kubectl(config_file=config_file) + return kubectl.get_services( + field_selector="metadata.namespace={}".format(kdu_instance) + ) + + async def get_service( + self, cluster_uuid: str, service_name: str, namespace: str + ) -> object: + """Return data for a specific service inside a namespace""" + + credentials = self.get_credentials(cluster_uuid=cluster_uuid) + + config_path = "/tmp/{}".format(cluster_uuid) + config_file = "{}/config".format(config_path) + + if not os.path.exists(config_path): + os.makedirs(config_path) + with open(config_file, "w") as f: + f.write(credentials) + + kubectl = Kubectl(config_file=config_file) + + return kubectl.get_services( + field_selector="metadata.name={},metadata.namespace={}".format( + service_name, namespace + ) + )[0] + # Private methods - async def add_k8s( - self, - cloud_name: str, - credentials: str, - ) -> bool: + async def add_k8s(self, cloud_name: str, credentials: str,) -> bool: """Add a k8s cloud to Juju Adds a Kubernetes cloud to Juju, so it can be bootstrapped with a @@ -679,7 +750,7 @@ class K8sJujuConnector(K8sConnector): await process.stdin.drain() process.stdin.close() - stdout, stderr = await process.communicate() + _stdout, stderr = await process.communicate() return_code = process.returncode @@ -690,11 +761,7 @@ class K8sJujuConnector(K8sConnector): return True - async def add_model( - self, - model_name: str, - cluster_uuid: str, - ) -> juju.model.Model: + async def add_model(self, model_name: str, cluster_uuid: str,) -> Model: """Adds a model to the controller Adds a new model to the Juju controller @@ -706,12 +773,17 @@ class K8sJujuConnector(K8sConnector): if not self.authenticated: await self.login(cluster_uuid) - self.log.debug("Adding model '{}' to cluster_uuid '{}'".format(model_name, cluster_uuid)) + self.log.debug( + "Adding model '{}' to cluster_uuid '{}'".format(model_name, cluster_uuid) + ) + model = None try: - model = await self.controller.add_model( - model_name, - config={'authorized-keys': self.juju_public_key} - ) + if self.juju_public_key is not None: + model = await self.controller.add_model( + model_name, config={"authorized-keys": self.juju_public_key} + ) + else: + model = await self.controller.add_model(model_name) except Exception as ex: self.log.debug(ex) self.log.debug("Caught exception: {}".format(ex)) @@ -720,10 +792,7 @@ class K8sJujuConnector(K8sConnector): return model async def bootstrap( - self, - cloud_name: str, - cluster_uuid: str, - loadbalancer: bool + self, cloud_name: str, cluster_uuid: str, loadbalancer: bool ) -> bool: """Bootstrap a Kubernetes controller @@ -739,35 +808,38 @@ class K8sJujuConnector(K8sConnector): cmd = [self.juju_command, "bootstrap", cloud_name, cluster_uuid] else: """ - For public clusters, specify that the controller service is using a LoadBalancer. + For public clusters, specify that the controller service is using a + LoadBalancer. """ - cmd = [self.juju_command, "bootstrap", cloud_name, cluster_uuid, "--config", "controller-service-type=loadbalancer"] - - self.log.debug("Bootstrapping controller {} in cloud {}".format( - cluster_uuid, cloud_name - )) + cmd = [ + self.juju_command, + "bootstrap", + cloud_name, + cluster_uuid, + "--config", + "controller-service-type=loadbalancer", + ] + + self.log.debug( + "Bootstrapping controller {} in cloud {}".format(cluster_uuid, cloud_name) + ) process = await asyncio.create_subprocess_exec( - *cmd, - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.PIPE, + *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, ) - stdout, stderr = await process.communicate() + _stdout, stderr = await process.communicate() return_code = process.returncode if return_code > 0: # - if b'already exists' not in stderr: + if b"already exists" not in stderr: raise Exception(stderr) return True - async def destroy_controller( - self, - cluster_uuid: str - ) -> bool: + async def destroy_controller(self, cluster_uuid: str) -> bool: """Destroy a Kubernetes controller Destroy an existing Kubernetes controller. @@ -781,28 +853,41 @@ class K8sJujuConnector(K8sConnector): "--destroy-all-models", "--destroy-storage", "-y", - cluster_uuid + cluster_uuid, ] process = await asyncio.create_subprocess_exec( - *cmd, - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.PIPE, + *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, ) - stdout, stderr = await process.communicate() + _stdout, stderr = await process.communicate() return_code = process.returncode if return_code > 0: # - if 'already exists' not in stderr: + if "already exists" not in stderr: raise Exception(stderr) - def get_config( - self, - cluster_uuid: str, - ) -> dict: + def get_credentials(self, cluster_uuid: str) -> str: + """ + Get Cluster Kubeconfig + """ + k8scluster = self.db.get_one( + "k8sclusters", q_filter={"_id": cluster_uuid}, fail_on_empty=False + ) + + self.db.encrypt_decrypt_fields( + k8scluster.get("credentials"), + "decrypt", + ["password", "secret"], + schema_version=k8scluster["schema_version"], + salt=k8scluster["_id"], + ) + + return yaml.safe_dump(k8scluster.get("credentials")) + + def get_config(self, cluster_uuid: str,) -> dict: """Get the cluster configuration Gets the configuration of the cluster @@ -812,21 +897,15 @@ class K8sJujuConnector(K8sConnector): """ cluster_config = "{}/{}.yaml".format(self.fs.path, cluster_uuid) if os.path.exists(cluster_config): - with open(cluster_config, 'r') as f: + with open(cluster_config, "r") as f: config = yaml.safe_load(f.read()) return config else: raise Exception( - "Unable to locate configuration for cluster {}".format( - cluster_uuid - ) + "Unable to locate configuration for cluster {}".format(cluster_uuid) ) - async def get_model( - self, - model_name: str, - cluster_uuid: str, - ) -> juju.model.Model: + async def get_model(self, model_name: str, cluster_uuid: str,) -> Model: """Get a model from the Juju Controller. Note: Model objects returned must call disconnected() before it goes @@ -840,18 +919,12 @@ class K8sJujuConnector(K8sConnector): model = None models = await self.controller.list_models() - self.log.debug(models) if model_name in models: self.log.debug("Found model: {}".format(model_name)) - model = await self.controller.get_model( - model_name - ) + model = await self.controller.get_model(model_name) return model - def get_namespace( - self, - cluster_uuid: str, - ) -> str: + def get_namespace(self, cluster_uuid: str,) -> str: """Get the namespace UUID Gets the namespace's unique name @@ -861,18 +934,15 @@ class K8sJujuConnector(K8sConnector): config = self.get_config(cluster_uuid) # Make sure the name is in the config - if 'namespace' not in config: + if "namespace" not in config: raise Exception("Namespace not found.") # TODO: We want to make sure this is unique to the cluster, in case # the cluster is being reused. # Consider pre/appending the cluster id to the namespace string - return config['namespace'] + return config["namespace"] - async def has_model( - self, - model_name: str - ) -> bool: + async def has_model(self, model_name: str) -> bool: """Check if a model exists in the controller Checks to see if a model exists in the connected Juju controller. @@ -886,10 +956,7 @@ class K8sJujuConnector(K8sConnector): return True return False - def is_local_k8s( - self, - credentials: str, - ) -> bool: + def is_local_k8s(self, credentials: str,) -> bool: """Check if a cluster is local Checks if a cluster is running in the local host @@ -897,14 +964,13 @@ class K8sJujuConnector(K8sConnector): :param credentials dict: A dictionary containing the k8s credentials :returns: A boolean if the cluster is running locally """ + creds = yaml.safe_load(credentials) - if os.getenv("OSMLCM_VCA_APIPROXY"): - host_ip = os.getenv("OSMLCM_VCA_APIPROXY") - if creds and host_ip: - for cluster in creds['clusters']: - if 'server' in cluster['cluster']: - if host_ip in cluster['cluster']['server']: + if creds and os.getenv("OSMLCM_VCA_APIPROXY"): + for cluster in creds["clusters"]: + if "server" in cluster["cluster"]: + if os.getenv("OSMLCM_VCA_APIPROXY") in cluster["cluster"]["server"]: return True return False @@ -920,10 +986,10 @@ class K8sJujuConnector(K8sConnector): # Test: Make sure we have the credentials loaded config = self.get_config(cluster_uuid) - self.juju_endpoint = config['endpoint'] - self.juju_user = config['username'] - self.juju_secret = config['secret'] - self.juju_ca_cert = config['cacert'] + self.juju_endpoint = config["endpoint"] + self.juju_user = config["username"] + self.juju_secret = config["secret"] + self.juju_ca_cert = config["cacert"] self.juju_public_key = None self.controller = Controller() @@ -931,9 +997,7 @@ class K8sJujuConnector(K8sConnector): if self.juju_secret: self.log.debug( "Connecting to controller... ws://{} as {}/{}".format( - self.juju_endpoint, - self.juju_user, - self.juju_secret, + self.juju_endpoint, self.juju_user, self.juju_secret, ) ) try: @@ -964,18 +1028,13 @@ class K8sJujuConnector(K8sConnector): await self.models[model].disconnect() if self.controller: - self.log.debug("Disconnecting controller {}".format( - self.controller - )) + self.log.debug("Disconnecting controller {}".format(self.controller)) await self.controller.disconnect() self.controller = None self.authenticated = False - async def remove_cloud( - self, - cloud_name: str, - ) -> bool: + async def remove_cloud(self, cloud_name: str,) -> bool: """Remove a k8s cloud from Juju Removes a Kubernetes cloud from Juju. @@ -988,12 +1047,10 @@ class K8sJujuConnector(K8sConnector): # Remove the bootstrapped controller cmd = [self.juju_command, "remove-k8s", "--client", cloud_name] process = await asyncio.create_subprocess_exec( - *cmd, - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.PIPE, + *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, ) - stdout, stderr = await process.communicate() + _stdout, stderr = await process.communicate() return_code = process.returncode @@ -1003,12 +1060,10 @@ class K8sJujuConnector(K8sConnector): # Remove the cloud from the local config cmd = [self.juju_command, "remove-cloud", "--client", cloud_name] process = await asyncio.create_subprocess_exec( - *cmd, - stdout=asyncio.subprocess.PIPE, - stderr=asyncio.subprocess.PIPE, + *cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE, ) - stdout, stderr = await process.communicate() + _stdout, stderr = await process.communicate() return_code = process.returncode @@ -1017,11 +1072,7 @@ class K8sJujuConnector(K8sConnector): return True - async def set_config( - self, - cluster_uuid: str, - config: dict, - ) -> bool: + async def set_config(self, cluster_uuid: str, config: dict,) -> bool: """Save the cluster configuration Saves the cluster information to the file store @@ -1034,7 +1085,7 @@ class K8sJujuConnector(K8sConnector): cluster_config = "{}/{}.yaml".format(self.fs.path, cluster_uuid) if not os.path.exists(cluster_config): self.log.debug("Writing config to {}".format(cluster_config)) - with open(cluster_config, 'w') as f: + with open(cluster_config, "w") as f: f.write(yaml.dump(config, Dumper=yaml.Dumper)) return True