X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_helm3_conn.py;h=edefc8677a9a8e2ed13b598d7bd240f719f9f7e1;hp=25128b045cde54d0a9244734e66f8b1199f79eea;hb=ba1d07263821169bc36b3f9f9f93cbed93baad4a;hpb=095392b4b80e0b63c66282f283c1139ec0536750 diff --git a/n2vc/k8s_helm3_conn.py b/n2vc/k8s_helm3_conn.py index 25128b0..edefc86 100644 --- a/n2vc/k8s_helm3_conn.py +++ b/n2vc/k8s_helm3_conn.py @@ -35,13 +35,13 @@ class K8sHelm3Connector(K8sHelmBaseConnector): """ def __init__( - self, - fs: object, - db: object, - kubectl_command: str = "/usr/bin/kubectl", - helm_command: str = "/usr/bin/helm3", - log: object = None, - on_update_db=None, + self, + fs: object, + db: object, + kubectl_command: str = "/usr/bin/kubectl", + helm_command: str = "/usr/bin/helm3", + log: object = None, + on_update_db=None, ): """ Initializes helm connector for helm v3 @@ -55,27 +55,48 @@ class K8sHelm3Connector(K8sHelmBaseConnector): """ # parent class - K8sHelmBaseConnector.__init__(self, - db=db, - log=log, - fs=fs, - kubectl_command=kubectl_command, - helm_command=helm_command, - on_update_db=on_update_db) + K8sHelmBaseConnector.__init__( + self, + db=db, + log=log, + fs=fs, + kubectl_command=kubectl_command, + helm_command=helm_command, + on_update_db=on_update_db, + ) self.log.info("K8S Helm3 connector initialized") async def install( - self, - cluster_uuid: str, - kdu_model: str, - atomic: bool = True, - timeout: float = 300, - params: dict = None, - db_dict: dict = None, - kdu_name: str = None, - namespace: str = None, + self, + cluster_uuid: str, + kdu_model: str, + kdu_instance: str, + atomic: bool = True, + timeout: float = 300, + params: dict = None, + db_dict: dict = None, + kdu_name: str = None, + namespace: str = None, + **kwargs, ): + """Install a helm chart + + :param cluster_uuid str: The UUID of the cluster to install to + :param kdu_model str: The name or path of a bundle to install + :param kdu_instance: Kdu instance name + :param atomic bool: If set, waits until the model is active and resets + the cluster on failure. + :param timeout int: The time, in seconds, to wait for the install + 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 + + :param kwargs: Additional parameters (None yet) + + :return: True if successful + """ _, cluster_id = self._get_namespace_cluster_id(cluster_uuid) self.log.debug("installing {} in cluster {}".format(kdu_model, cluster_id)) @@ -89,26 +110,37 @@ class K8sHelm3Connector(K8sHelmBaseConnector): # for helm3 if namespace does not exist must create it if namespace and namespace != "kube-system": - namespaces = await self._get_namespaces(cluster_id) - if namespace not in namespaces: - await self._create_namespace(cluster_id, namespace) - - kdu_instance = await self._install_impl(cluster_id, - kdu_model, - paths, - env, - atomic=atomic, - timeout=timeout, - params=params, - db_dict=db_dict, - kdu_name=kdu_name, - namespace=namespace) + if not await self._namespace_exists(cluster_id, namespace): + try: + await self._create_namespace(cluster_id, namespace) + except Exception as e: + if not await self._namespace_exists(cluster_id, namespace): + err_msg = ( + "namespace {} does not exist in cluster_id {} " + "error message: ".format(namespace, e) + ) + self.log.error(err_msg) + raise K8sException(err_msg) + + await self._install_impl( + cluster_id, + kdu_model, + paths, + env, + kdu_instance, + atomic=atomic, + timeout=timeout, + params=params, + db_dict=db_dict, + kdu_name=kdu_name, + namespace=namespace, + ) # sync fs self.fs.reverse_sync(from_path=cluster_id) self.log.debug("Returning kdu_instance {}".format(kdu_instance)) - return kdu_instance + return True async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str: @@ -183,7 +215,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): paths = { "kube_dir": kube_dir, "kube_config": config_filename, - "cluster_dir": cluster_dir + "cluster_dir": cluster_dir, } # 3 - Prepare environment variables @@ -191,7 +223,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): "HELM_CACHE_HOME": helm_path_cache, "HELM_CONFIG_HOME": helm_path_config, "HELM_DATA_HOME": helm_path_data, - "KUBECONFIG": config_filename + "KUBECONFIG": config_filename, } for file_name, file in paths.items(): @@ -202,8 +234,16 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return paths, env - async def _get_namespaces(self, - cluster_id: str): + async def _namespace_exists(self, cluster_id, namespace) -> bool: + self.log.debug( + "checking if namespace {} exists cluster_id {}".format( + namespace, cluster_id + ) + ) + namespaces = await self._get_namespaces(cluster_id) + return namespace in namespaces if namespaces else False + + async def _get_namespaces(self, cluster_id: str): self.log.debug("get namespaces cluster_id {}".format(cluster_id)) @@ -225,9 +265,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return namespaces - async def _create_namespace(self, - cluster_id: str, - namespace: str): + async def _create_namespace(self, cluster_id: str, namespace: str): self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}") @@ -256,9 +294,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): command1 = "{} get manifest {} --namespace={}".format( self._helm_command, kdu_instance, namespace ) - command2 = "{} get --namespace={} -f -".format( - self.kubectl_command, namespace - ) + command2 = "{} get --namespace={} -f -".format(self.kubectl_command, namespace) output, _rc = await self._local_async_exec_pipe( command1, command2, env=env, raise_exception_on_error=True ) @@ -279,15 +315,9 @@ class K8sHelm3Connector(K8sHelmBaseConnector): # If default repo is not included add cluster_uuid = "{}:{}".format(namespace, cluster_id) repo_list = await self.repo_list(cluster_uuid) - for repo in repo_list: - self.log.debug("repo") - if repo["name"] == "stable": - self.log.debug("Default repo already present") - break - else: - await self.repo_add(cluster_uuid, - "stable", - "https://kubernetes-charts.storage.googleapis.com/") + stable_repo = [repo for repo in repo_list if repo["name"] == "stable"] + if not stable_repo and self._stable_repo_url: + await self.repo_add(cluster_uuid, "stable", self._stable_repo_url) # Returns False as no software needs to be uninstalled return False @@ -303,9 +333,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): cluster_name=cluster_id, create_if_not_exist=True ) - command = "{} list --all-namespaces --output yaml".format( - self._helm_command - ) + command = "{} list --all-namespaces --output yaml".format(self._helm_command) output, _rc = await self._local_async_exec( command=command, raise_exception_on_error=True, env=env ) @@ -316,8 +344,9 @@ class K8sHelm3Connector(K8sHelmBaseConnector): else: return [] - def _get_inspect_command(self, inspect_command: str, kdu_model: str, repo_str: str, - version: str): + def _get_inspect_command( + self, inspect_command: str, kdu_model: str, repo_str: str, version: str + ): inspect_command = "{} show {} {}{} {}".format( self._helm_command, inspect_command, kdu_model, repo_str, version ) @@ -332,7 +361,9 @@ class K8sHelm3Connector(K8sHelmBaseConnector): return_text: bool = False, ): - self.log.debug("status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)) + self.log.debug( + "status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace) + ) if not namespace: namespace = "kube-system" @@ -349,7 +380,7 @@ class K8sHelm3Connector(K8sHelmBaseConnector): command=command, raise_exception_on_error=True, show_error_log=show_error_log, - env=env + env=env, ) if return_text: @@ -370,8 +401,16 @@ class K8sHelm3Connector(K8sHelmBaseConnector): # unable to parse 'resources' as currently it is not included in helm3 return data - def _get_install_command(self, kdu_model: str, kdu_instance: str, namespace: str, - params_str: str, version: str, atomic: bool, timeout: float) -> str: + def _get_install_command( + self, + kdu_model: str, + kdu_instance: str, + namespace: str, + params_str: str, + version: str, + atomic: bool, + timeout: float, + ) -> str: timeout_str = "" if timeout: @@ -406,8 +445,16 @@ class K8sHelm3Connector(K8sHelmBaseConnector): ) return command - def _get_upgrade_command(self, kdu_model: str, kdu_instance: str, namespace: str, - params_str: str, version: str, atomic: bool, timeout: float) -> str: + def _get_upgrade_command( + self, + kdu_model: str, + kdu_instance: str, + namespace: str, + params_str: str, + version: str, + atomic: bool, + timeout: float, + ) -> str: timeout_str = "" if timeout: @@ -443,7 +490,9 @@ class K8sHelm3Connector(K8sHelmBaseConnector): ) return command - def _get_rollback_command(self, kdu_instance: str, namespace: str, revision: float) -> str: + def _get_rollback_command( + self, kdu_instance: str, namespace: str, revision: float + ) -> str: return "{} rollback {} {} --namespace={} --wait".format( self._helm_command, kdu_instance, revision, namespace ) @@ -451,7 +500,8 @@ class K8sHelm3Connector(K8sHelmBaseConnector): def _get_uninstall_command(self, kdu_instance: str, namespace: str) -> str: return "{} uninstall {} --namespace={}".format( - self._helm_command, kdu_instance, namespace) + self._helm_command, kdu_instance, namespace + ) def _get_helm_chart_repos_ids(self, cluster_uuid) -> list: repo_ids = []