cleanup deploy

fivestars-os · Nov 5, 2024 · 749f1ce · 749f1ce
1 parent 28aa4dd
commit 749f1ce
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/aladdin/commands/deploy.py b/aladdin/commands/deploy.py
@@ -86,7 +86,6 @@ def deploy(
         helm.upgrade(
             HelmRules.get_release_name(chart),
             helm_chart_path,
-            [],
             namespace,
             force=force_helm,
             dry_run=dry_run,

diff --git a/aladdin/lib/k8s/helm.py b/aladdin/lib/k8s/helm.py
@@ -128,12 +128,10 @@ def upgrade(
         self,
         release_name: str,
         chart_path: str,
-        values_files: List[str],
         namespace: str,
         force=False,
         dry_run=False,
         helm_args: list = None,
-        all_values=True,
         **values,
     ):
         if helm_args is None:
@@ -149,12 +147,12 @@ def upgrade(
             "--install",
             f"--namespace={namespace}",
         ]
-        if all_values:
-            command.append(f"--values={chart_path}/values.yaml")
 
-        command = self.prepare_command(
-            command, chart_path, values_files, namespace, helm_args=helm_args, **values
-        )
+        for set_name, set_val in values.items():
+            command.extend(["--set", "{}={}".format(set_name, set_val)])
+
+        if helm_args:
+            command.extend(helm_args)
 
         logger.info("Executing: %s", " ".join(command))
         return subprocess.run(["helm", *command], check=True)