summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
7d0735d)
Change-Id: Idc4c6454e539b0935d57b5b0cdcc0895b5d00895
Signed-off-by: lloretgalleg <illoret@indra.es>
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
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")
else:
await self.repo_add(cluster_uuid,
"stable",
else:
await self.repo_add(cluster_uuid,
"stable",
- "https://charts.helm.sh/stable")
# Returns False as no software needs to be uninstalled
return False
# Returns False as no software needs to be uninstalled
return False
####################################################################################
"""
service_account = "osm"
####################################################################################
"""
service_account = "osm"
+ _STABLE_REPO_URL = "https://charts.helm.sh/stable"
helm_command: str = "/usr/bin/helm",
log: object = None,
on_update_db=None,
helm_command: str = "/usr/bin/helm",
log: object = None,
on_update_db=None,
+ vca_config: dict = None,
self._helm_command = helm_command
self._check_file_exists(filename=helm_command, exception_if_not_exists=True)
self._helm_command = helm_command
self._check_file_exists(filename=helm_command, exception_if_not_exists=True)
+ # obtain stable repo url from config or apply default
+ if not vca_config or not vca_config.get("stablerepourl"):
+ self._stable_repo_url = self._STABLE_REPO_URL
+ else:
+ self._stable_repo_url = vca_config.get("stablerepourl")
+
@staticmethod
def _get_namespace_cluster_id(cluster_uuid: str) -> (str, str):
"""
@staticmethod
def _get_namespace_cluster_id(cluster_uuid: str) -> (str, str):
"""
helm_command: str = "/usr/bin/helm",
log: object = None,
on_update_db=None,
helm_command: str = "/usr/bin/helm",
log: object = None,
on_update_db=None,
+ vca_config: dict = None,
):
"""
Initializes helm connector for helm v2
):
"""
Initializes helm connector for helm v2
kubectl_command=kubectl_command,
helm_command=helm_command,
on_update_db=on_update_db,
kubectl_command=kubectl_command,
helm_command=helm_command,
on_update_db=on_update_db,
)
self.log.info("Initializing K8S Helm2 connector")
)
self.log.info("Initializing K8S Helm2 connector")
command = (
"{} --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
command = (
"{} --kubeconfig={} --tiller-namespace={} --home={} --service-account {} "
+ " --stable-repo-url {} init"
).format(
self._helm_command,
paths["kube_config"],
namespace,
paths["helm_dir"],
self.service_account,
).format(
self._helm_command,
paths["kube_config"],
namespace,
paths["helm_dir"],
self.service_account,
)
_, _rc = await self._local_async_exec(
command=command, raise_exception_on_error=True, env=env
)
_, _rc = await self._local_async_exec(
command=command, raise_exception_on_error=True, env=env
else:
self.log.info("Helm client already initialized")
else:
self.log.info("Helm client already initialized")
+ # remove old stable repo and add new one
+ cluster_uuid = "{}:{}".format(namespace, cluster_id)
+ repo_list = await self.repo_list(cluster_uuid)
+ for repo in repo_list:
+ if repo["name"] == "stable" and repo["url"] != self._stable_repo_url:
+ self.log.debug("Add new stable repo url: {}")
+ await self.repo_remove(cluster_uuid,
+ "stable")
+ await self.repo_add(cluster_uuid,
+ "stable",
+ self._stable_repo_url)
+ break
+
return n2vc_installed_sw
async def _uninstall_sw(self, cluster_id: str, namespace: str):
return n2vc_installed_sw
async def _uninstall_sw(self, cluster_id: str, namespace: str):