projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add generate_kdu_instance_name method in K8sConn
[osm/N2VC.git]
/
n2vc
/
k8s_helm3_conn.py
diff --git
a/n2vc/k8s_helm3_conn.py
b/n2vc/k8s_helm3_conn.py
index
5a8c41f
..
6afadbf
100644
(file)
--- a/
n2vc/k8s_helm3_conn.py
+++ b/
n2vc/k8s_helm3_conn.py
@@
-42,6
+42,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
helm_command: str = "/usr/bin/helm3",
log: object = None,
on_update_db=None,
helm_command: str = "/usr/bin/helm3",
log: object = None,
on_update_db=None,
+ vca_config: dict = None,
):
"""
Initializes helm connector for helm v3
):
"""
Initializes helm connector for helm v3
@@
-61,7
+62,8
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
fs=fs,
kubectl_command=kubectl_command,
helm_command=helm_command,
fs=fs,
kubectl_command=kubectl_command,
helm_command=helm_command,
- on_update_db=on_update_db)
+ on_update_db=on_update_db,
+ vca_config=vca_config)
self.log.info("K8S Helm3 connector initialized")
self.log.info("K8S Helm3 connector initialized")
@@
-69,6
+71,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
self,
cluster_uuid: str,
kdu_model: str,
self,
cluster_uuid: str,
kdu_model: str,
+ kdu_instance: str,
atomic: bool = True,
timeout: float = 300,
params: dict = None,
atomic: bool = True,
timeout: float = 300,
params: dict = None,
@@
-93,22
+96,25
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
if namespace not in namespaces:
await self._create_namespace(cluster_id, namespace)
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)
+ 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))
# sync fs
self.fs.reverse_sync(from_path=cluster_id)
self.log.debug("Returning kdu_instance {}".format(kdu_instance))
- return
kdu_instanc
e
+ return
Tru
e
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
async def inspect_kdu(self, kdu_model: str, repo_url: str = None) -> str:
@@
-287,7
+293,7
@@
class K8sHelm3Connector(K8sHelmBaseConnector):
else:
await self.repo_add(cluster_uuid,
"stable",
else:
await self.repo_add(cluster_uuid,
"stable",
-
"https://charts.helm.sh/stable"
)
+
self._stable_repo_url
)
# Returns False as no software needs to be uninstalled
return False
# Returns False as no software needs to be uninstalled
return False