X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FN2VC.git;a=blobdiff_plain;f=n2vc%2Fk8s_helm_base_conn.py;h=9b0ca861bc99cc2d537c3abab298f8e655841b68;hp=5079dbe6f917fe53894cda0d4f402c4a8d9a81c2;hb=d4cee8c1edd901a2922bb2593e5b643844f83b3a;hpb=a8980cc3f6508f2659dc4ba4fcbeed65ba3c8e95 diff --git a/n2vc/k8s_helm_base_conn.py b/n2vc/k8s_helm_base_conn.py index 5079dbe..9b0ca86 100644 --- a/n2vc/k8s_helm_base_conn.py +++ b/n2vc/k8s_helm_base_conn.py @@ -175,15 +175,6 @@ class K8sHelmBaseConnector(K8sConnector): # sync local dir self.fs.sync(from_path=cluster_uuid) - # helm repo update - command = "env KUBECONFIG={} {} repo update".format( - paths["kube_config"], self._helm_command - ) - self.log.debug("updating repo: {}".format(command)) - await self._local_async_exec( - command=command, raise_exception_on_error=False, env=env - ) - # helm repo add name url command = ("env KUBECONFIG={} {} repo add {} {}").format( paths["kube_config"], self._helm_command, name, url @@ -191,7 +182,7 @@ class K8sHelmBaseConnector(K8sConnector): if cert: temp_cert_file = os.path.join( - self.fs.path, "{}/helmcerts/".format(cluster_id), "temp.crt" + self.fs.path, "{}/helmcerts/".format(cluster_uuid), "temp.crt" ) os.makedirs(os.path.dirname(temp_cert_file), exist_ok=True) with open(temp_cert_file, "w") as the_cert: @@ -209,6 +200,15 @@ class K8sHelmBaseConnector(K8sConnector): command=command, raise_exception_on_error=True, env=env ) + # helm repo update + command = "env KUBECONFIG={} {} repo update".format( + paths["kube_config"], self._helm_command + ) + self.log.debug("updating repo: {}".format(command)) + await self._local_async_exec( + command=command, raise_exception_on_error=False, env=env + ) + # sync fs self.fs.reverse_sync(from_path=cluster_uuid)