X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_juju_conn.py;h=3316087d975889111ea4166a719babfee9472110;hp=53f215a5db2a355b3754766aedab4ce6c065009c;hb=620fa3c11297a0938f25cb867a9a341b50098409;hpb=f00dcaeedafa3a57735abfd9c16515fe5986f41f diff --git a/n2vc/k8s_juju_conn.py b/n2vc/k8s_juju_conn.py index 53f215a..3316087 100644 --- a/n2vc/k8s_juju_conn.py +++ b/n2vc/k8s_juju_conn.py @@ -23,8 +23,6 @@ from juju.controller import Controller from juju.model import Model from juju.errors import JujuAPIError, JujuError -import logging - from n2vc.k8s_conn import K8sConnector import os @@ -44,7 +42,7 @@ class K8sJujuConnector(K8sConnector): db: object, kubectl_command: str = '/usr/bin/kubectl', juju_command: str = '/usr/bin/juju', - log=None, + log: object = None, on_update_db=None, ): """ @@ -64,16 +62,15 @@ class K8sJujuConnector(K8sConnector): ) self.fs = fs - self.info('Initializing K8S Juju connector') + self.log.debug('Initializing K8S Juju connector') self.authenticated = False self.models = {} - self.log = logging.getLogger(__name__) self.juju_command = juju_command self.juju_secret = "" - self.info('K8S Juju connector initialized') + self.log.debug('K8S Juju connector initialized') """Initialization""" async def init_env( @@ -144,19 +141,19 @@ class K8sJujuConnector(K8sConnector): # Name the new k8s cloud k8s_cloud = "k8s-{}".format(cluster_uuid) - print("Adding k8s cloud {}".format(k8s_cloud)) + self.log.debug("Adding k8s cloud {}".format(k8s_cloud)) await self.add_k8s(k8s_cloud, k8s_creds) # Bootstrap Juju controller - print("Bootstrapping...") + self.log.debug("Bootstrapping...") await self.bootstrap(k8s_cloud, cluster_uuid, loadbalancer) - print("Bootstrap done.") + self.log.debug("Bootstrap done.") # Get the controller information # Parse ~/.local/share/juju/controllers.yaml # controllers.testing.api-endpoints|ca-cert|uuid - print("Getting controller endpoints") + self.log.debug("Getting controller endpoints") with open(os.path.expanduser( "~/.local/share/juju/controllers.yaml" )) as f: @@ -168,7 +165,7 @@ class K8sJujuConnector(K8sConnector): # Parse ~/.local/share/juju/accounts # controllers.testing.user|password - print("Getting accounts") + self.log.debug("Getting accounts") with open(os.path.expanduser( "~/.local/share/juju/accounts.yaml" )) as f: @@ -178,11 +175,6 @@ class K8sJujuConnector(K8sConnector): self.juju_user = controller['user'] self.juju_secret = controller['password'] - print("user: {}".format(self.juju_user)) - print("secret: {}".format(self.juju_secret)) - print("endpoint: {}".format(self.juju_endpoint)) - print("ca-cert: {}".format(self.juju_ca_cert)) - # raise Exception("EOL") self.juju_public_key = None @@ -198,7 +190,7 @@ class K8sJujuConnector(K8sConnector): # Store the cluster configuration so it # can be used for subsequent calls - print("Setting config") + self.log.debug("Setting config") await self.set_config(cluster_uuid, config) else: @@ -218,15 +210,15 @@ class K8sJujuConnector(K8sConnector): 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( - self.get_namespace(cluster_uuid), - cluster_uuid=cluster_uuid - ) + #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(): - await model.disconnect() + ## Disconnect from the model + #if model and model.is_connected(): + # await model.disconnect() return cluster_uuid, True @@ -281,27 +273,28 @@ class K8sJujuConnector(K8sConnector): # Destroy the model namespace = self.get_namespace(cluster_uuid) if await self.has_model(namespace): - print("[reset] Destroying model") + self.log.debug("[reset] Destroying model") await self.controller.destroy_model( namespace, destroy_storage=True ) # Disconnect from the controller - print("[reset] Disconnecting controller") - await self.controller.disconnect() + self.log.debug("[reset] Disconnecting controller") + await self.logout() # Destroy the controller (via CLI) - print("[reset] Destroying controller") + self.log.debug("[reset] Destroying controller") await self.destroy_controller(cluster_uuid) - print("[reset] Removing k8s cloud") - namespace = self.get_namespace(cluster_uuid) - k8s_cloud = "{}-k8s".format(namespace) + self.log.debug("[reset] Removing k8s cloud") + k8s_cloud = "k8s-{}".format(cluster_uuid) await self.remove_cloud(k8s_cloud) except Exception as ex: - print("Caught exception during reset: {}".format(ex)) + self.log.debug("Caught exception during reset: {}".format(ex)) + + return True """Deployment""" @@ -330,7 +323,7 @@ class K8sJujuConnector(K8sConnector): """ if not self.authenticated: - print("[install] Logging in to the controller") + self.log.debug("[install] Logging in to the controller") await self.login(cluster_uuid) ## @@ -342,11 +335,10 @@ class K8sJujuConnector(K8sConnector): kdu_instance = db_dict["filter"]["_id"] self.log.debug("Checking for model named {}".format(kdu_instance)) - model = await self.get_model(kdu_instance, cluster_uuid=cluster_uuid) - if not model: - # Create the new model - self.log.debug("Adding model: {}".format(kdu_instance)) - model = await self.add_model(kdu_instance, cluster_uuid=cluster_uuid) + + # Create the new model + self.log.debug("Adding model: {}".format(kdu_instance)) + model = await self.add_model(kdu_instance, cluster_uuid=cluster_uuid) if model: # TODO: Instantiation parameters @@ -359,6 +351,8 @@ class K8sJujuConnector(K8sConnector): - """ + previous_workdir = os.getcwd() + bundle = kdu_model if kdu_model.startswith("cs:"): bundle = kdu_model @@ -366,31 +360,30 @@ class K8sJujuConnector(K8sConnector): # Download the file pass else: - # Local file + new_workdir = kdu_model.strip(kdu_model.split("/")[-1]) - # if kdu_model.endswith(".tar.gz") or kdu_model.endswith(".tgz") - # Uncompress temporarily - # bundle = - pass + os.chdir(new_workdir) + + bundle = "local:{}".format(kdu_model) if not bundle: # Raise named exception that the bundle could not be found raise Exception() - print("[install] deploying {}".format(bundle)) + self.log.debug("[install] deploying {}".format(bundle)) await model.deploy(bundle) # Get the application if atomic: # applications = model.applications - print("[install] Applications: {}".format(model.applications)) + self.log.debug("[install] Applications: {}".format(model.applications)) for name in model.applications: - print("[install] Waiting for {} to settle".format(name)) + self.log.debug("[install] Waiting for {} to settle".format(name)) application = model.applications[name] try: # It's not enough to wait for all units to be active; # the application status needs to be active as well. - print("Waiting for all units to be active...") + self.log.debug("Waiting for all units to be active...") await model.block_until( lambda: all( unit.agent_status == 'idle' @@ -401,18 +394,21 @@ class K8sJujuConnector(K8sConnector): ), timeout=timeout ) - print("All units active.") + self.log.debug("All units active.") except concurrent.futures._base.TimeoutError: - print("[install] Timeout exceeded; resetting cluster") + os.chdir(previous_workdir) + self.log.debug("[install] Timeout exceeded; resetting cluster") await self.reset(cluster_uuid) return False # Wait for the application to be active if model.is_connected(): - print("[install] Disconnecting model") + self.log.debug("[install] Disconnecting model") await model.disconnect() + os.chdir(previous_workdir) + return kdu_instance raise Exception("Unable to install") @@ -485,9 +481,9 @@ class K8sJujuConnector(K8sConnector): """ # TODO: This should be returned in an agreed-upon format for name in bundle['applications']: - print(model.applications) + self.log.debug(model.applications) application = model.applications[name] - print(application) + self.log.debug(application) path = bundle['applications'][name]['charm'] @@ -535,8 +531,17 @@ class K8sJujuConnector(K8sConnector): :return: Returns True if successful, or raises an exception """ + if not self.authenticated: + self.log.debug("[uninstall] Connecting to controller") + await self.login(cluster_uuid) + + self.log.debug("[uninstall] Destroying model") + await self.controller.destroy_models(kdu_instance) + self.log.debug("[uninstall] Model destroyed and disconnecting") + await self.logout() + return True """Introspection""" @@ -660,7 +665,7 @@ class K8sJujuConnector(K8sConnector): """ cmd = [self.juju_command, "add-k8s", "--local", cloud_name] - print(cmd) + self.log.debug(cmd) process = await asyncio.create_subprocess_exec( *cmd, @@ -678,7 +683,7 @@ class K8sJujuConnector(K8sConnector): return_code = process.returncode - print("add-k8s return code: {}".format(return_code)) + self.log.debug("add-k8s return code: {}".format(return_code)) if return_code > 0: raise Exception(stderr) @@ -702,10 +707,16 @@ class K8sJujuConnector(K8sConnector): await self.login(cluster_uuid) self.log.debug("Adding model '{}' to cluster_uuid '{}'".format(model_name, cluster_uuid)) - model = await self.controller.add_model( - model_name, - config={'authorized-keys': self.juju_public_key} - ) + try: + model = await self.controller.add_model( + model_name, + config={'authorized-keys': self.juju_public_key} + ) + except Exception as ex: + self.log.debug(ex) + self.log.debug("Caught exception: {}".format(ex)) + pass + return model async def bootstrap( @@ -732,7 +743,7 @@ class K8sJujuConnector(K8sConnector): """ cmd = [self.juju_command, "bootstrap", cloud_name, cluster_uuid, "--config", "controller-service-type=loadbalancer"] - print("Bootstrapping controller {} in cloud {}".format( + self.log.debug("Bootstrapping controller {} in cloud {}".format( cluster_uuid, cloud_name )) @@ -935,7 +946,7 @@ class K8sJujuConnector(K8sConnector): self.authenticated = True self.log.debug("JujuApi: Logged into controller") except Exception as ex: - print(ex) + self.log.debug(ex) self.log.debug("Caught exception: {}".format(ex)) pass else: @@ -944,12 +955,12 @@ class K8sJujuConnector(K8sConnector): async def logout(self): """Logout of the Juju controller.""" - print("[logout]") + self.log.debug("[logout]") if not self.authenticated: return False for model in self.models: - print("Logging out of model {}".format(model)) + self.log.debug("Logging out of model {}".format(model)) await self.models[model].disconnect() if self.controller: @@ -1022,7 +1033,7 @@ class K8sJujuConnector(K8sConnector): cluster_config = "{}/{}.yaml".format(self.fs.path, cluster_uuid) if not os.path.exists(cluster_config): - print("Writing config to {}".format(cluster_config)) + self.log.debug("Writing config to {}".format(cluster_config)) with open(cluster_config, 'w') as f: f.write(yaml.dump(config, Dumper=yaml.Dumper))