Fix bug 1448: minor fix in JujuModelWatcher.wait_for_model
[osm/N2VC.git] / n2vc / k8s_helm3_conn.py
index 25128b0..6afadbf 100644 (file)
@@ -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_instance
+        return True
 
     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://kubernetes-charts.storage.googleapis.com/")
+                                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