projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coverity-CWE 330: Use of Insufficiently Random Values
[osm/N2VC.git]
/
n2vc
/
k8s_helm3_conn.py
diff --git
a/n2vc/k8s_helm3_conn.py
b/n2vc/k8s_helm3_conn.py
index
3d7e3b2
..
4baadae
100644
(file)
--- a/
n2vc/k8s_helm3_conn.py
+++ b/
n2vc/k8s_helm3_conn.py
@@
-118,6
+118,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
if namespace and namespace != "kube-system":
if not await self._namespace_exists(cluster_uuid, namespace):
try:
if namespace and namespace != "kube-system":
if not await self._namespace_exists(cluster_uuid, namespace):
try:
+ # TODO: refactor to use kubernetes API client
await self._create_namespace(cluster_uuid, namespace)
except Exception as e:
if not await self._namespace_exists(cluster_uuid, namespace):
await self._create_namespace(cluster_uuid, namespace)
except Exception as e:
if not await self._namespace_exists(cluster_uuid, namespace):
@@
-149,7
+150,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
return True
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
return True
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
-
self.log.debug(
"inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url)
)
self.log.debug(
"inspect kdu_model {} from (optional) repo: {}".format(kdu_model, repo_url)
)
@@
-250,7
+250,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
return namespace in namespaces if namespaces else False
async def _get_namespaces(self, cluster_id: str):
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))
# init config, env
self.log.debug("get namespaces cluster_id {}".format(cluster_id))
# init config, env
@@
-272,7
+271,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
return namespaces
async def _create_namespace(self, cluster_id: str, namespace: str):
return namespaces
async def _create_namespace(self, cluster_id: str, namespace: str):
-
self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}")
# init config, env
self.log.debug(f"create namespace: {cluster_id} for cluster_id: {namespace}")
# init config, env
@@
-293,7
+291,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
async def _get_services(
self, cluster_id: str, kdu_instance: str, namespace: str, kubeconfig: str
):
async def _get_services(
self, cluster_id: str, kdu_instance: str, namespace: str, kubeconfig: str
):
-
# init config, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
# init config, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
@@
-318,6
+315,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
if namespace != "kube-system":
namespaces = await self._get_namespaces(cluster_id)
if namespace not in namespaces:
if namespace != "kube-system":
namespaces = await self._get_namespaces(cluster_id)
if namespace not in namespaces:
+ # TODO: refactor to use kubernetes API client
await self._create_namespace(cluster_id, namespace)
repo_list = await self.repo_list(cluster_id)
await self._create_namespace(cluster_id, namespace)
repo_list = await self.repo_list(cluster_id)
@@
-333,7
+331,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
pass
async def _instances_list(self, cluster_id: str):
pass
async def _instances_list(self, cluster_id: str):
-
# init paths, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
# init paths, env
paths, env = self._init_paths_env(
cluster_name=cluster_id, create_if_not_exist=True
@@
-389,7
+386,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
yaml_format: bool = False,
show_error_log: bool = False,
) -> Union[str, dict]:
yaml_format: bool = False,
show_error_log: bool = False,
) -> Union[str, dict]:
-
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
)
self.log.debug(
"status of kdu_instance: {}, namespace: {} ".format(kdu_instance, namespace)
)
@@
-448,7
+444,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
timeout: float,
kubeconfig: str,
) -> str:
timeout: float,
kubeconfig: str,
) -> str:
-
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
timeout_str = ""
if timeout:
timeout_str = "--timeout {}s".format(timeout)
@@
-614,7
+609,6
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
def _get_uninstall_command(
self, kdu_instance: str, namespace: str, kubeconfig: str
) -> str:
def _get_uninstall_command(
self, kdu_instance: str, namespace: str, kubeconfig: str
) -> str:
-
return "env KUBECONFIG={} {} uninstall {} --namespace={}".format(
kubeconfig, self._helm_command, kdu_instance, namespace
)
return "env KUBECONFIG={} {} uninstall {} --namespace={}".format(
kubeconfig, self._helm_command, kdu_instance, namespace
)