X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_lcm%2Fvim_sdn.py;h=a464993aadb8a69a7c438ac3981c62815202dcef;hb=e11384e1797ea0a5f8cd084d6f336948170bc640;hp=47015c0e2ead4839bbee1749b6c305f099bc8fd8;hpb=e789898a1681e9b8568f57608d7604a447250fe5;p=osm%2FLCM.git

diff --git a/osm_lcm/vim_sdn.py b/osm_lcm/vim_sdn.py
index 47015c0..a464993 100644
--- a/osm_lcm/vim_sdn.py
+++ b/osm_lcm/vim_sdn.py
@@ -22,7 +22,6 @@ import logging
 import logging.handlers
 from osm_lcm import ROclient
 from osm_lcm.lcm_utils import LcmException, LcmBase, deep_get
-from n2vc.k8s_helm_conn import K8sHelmConnector
 from n2vc.k8s_helm3_conn import K8sHelm3Connector
 from n2vc.k8s_juju_conn import K8sJujuConnector
 from n2vc.n2vc_juju_conn import N2VCJujuConnector
@@ -1078,15 +1077,6 @@ class K8sClusterLcm(LcmBase):
 
         super().__init__(msg, self.logger)
 
-        self.helm2_k8scluster = K8sHelmConnector(
-            kubectl_command=self.vca_config.get("kubectlpath"),
-            helm_command=self.vca_config.get("helmpath"),
-            log=self.logger,
-            on_update_db=None,
-            db=self.db,
-            fs=self.fs,
-        )
-
         self.helm3_k8scluster = K8sHelm3Connector(
             kubectl_command=self.vca_config.get("kubectlpath"),
             helm_command=self.vca_config.get("helm3path"),
@@ -1106,7 +1096,6 @@ class K8sClusterLcm(LcmBase):
         )
 
         self.k8s_map = {
-            "helm-chart": self.helm2_k8scluster,
             "helm-chart-v3": self.helm3_k8scluster,
             "juju-bundle": self.juju_k8scluster,
         }
@@ -1144,7 +1133,6 @@ class K8sClusterLcm(LcmBase):
             # for backwards compatibility and all-false case
             if not any(k8s_deploy_methods.values()):
                 k8s_deploy_methods = {
-                    "helm-chart": True,
                     "juju-bundle": True,
                     "helm-chart-v3": True,
                 }
@@ -1329,7 +1317,6 @@ class K8sClusterLcm(LcmBase):
             step = "Getting k8scluster='{}' from db".format(k8scluster_id)
             self.logger.debug(logging_text + step)
             db_k8scluster = self.db.get_one("k8sclusters", {"_id": k8scluster_id})
-            k8s_hc_id = deep_get(db_k8scluster, ("_admin", "helm-chart", "id"))
             k8s_h3c_id = deep_get(db_k8scluster, ("_admin", "helm-chart-v3", "id"))
             k8s_jb_id = deep_get(db_k8scluster, ("_admin", "juju-bundle", "id"))
 
@@ -1348,18 +1335,6 @@ class K8sClusterLcm(LcmBase):
                 db_k8scluster_update["_admin.juju-bundle.id"] = None
                 db_k8scluster_update["_admin.juju-bundle.operationalState"] = "DISABLED"
 
-            if k8s_hc_id:
-                step = "Removing helm-chart '{}'".format(k8s_hc_id)
-                uninstall_sw = (
-                    deep_get(db_k8scluster, ("_admin", "helm-chart", "created"))
-                    or False
-                )
-                cluster_removed = await self.helm2_k8scluster.reset(
-                    cluster_uuid=k8s_hc_id, uninstall_sw=uninstall_sw
-                )
-                db_k8scluster_update["_admin.helm-chart.id"] = None
-                db_k8scluster_update["_admin.helm-chart.operationalState"] = "DISABLED"
-
             if k8s_h3c_id:
                 step = "Removing helm-chart-v3 '{}'".format(k8s_h3c_id)
                 uninstall_sw = (
@@ -1375,16 +1350,16 @@ class K8sClusterLcm(LcmBase):
                 ] = "DISABLED"
 
             # Try to remove from cluster_inserted to clean old versions
-            if k8s_hc_id and cluster_removed:
+            if k8s_h3c_id and cluster_removed:
                 step = "Removing k8scluster='{}' from k8srepos".format(k8scluster_id)
                 self.logger.debug(logging_text + step)
                 db_k8srepo_list = self.db.get_list(
-                    "k8srepos", {"_admin.cluster-inserted": k8s_hc_id}
+                    "k8srepos", {"_admin.cluster-inserted": k8s_h3c_id}
                 )
                 for k8srepo in db_k8srepo_list:
                     try:
                         cluster_list = k8srepo["_admin"]["cluster-inserted"]
-                        cluster_list.remove(k8s_hc_id)
+                        cluster_list.remove(k8s_h3c_id)
                         self.update_db_2(
                             "k8srepos",
                             k8srepo["_id"],
@@ -1692,7 +1667,7 @@ class K8sRepoLcm(LcmBase):
 
         super().__init__(msg, self.logger)
 
-        self.k8srepo = K8sHelmConnector(
+        self.k8srepo = K8sHelm3Connector(
             kubectl_command=self.vca_config.get("kubectlpath"),
             helm_command=self.vca_config.get("helmpath"),
             fs=self.fs,