Fix helm stuff

sillsdev · Oct 17, 2024 · c91a7e1 · c91a7e1
1 parent 1714201
commit c91a7e1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/deploy/helm/thecombine/values.yaml b/deploy/helm/thecombine/values.yaml
@@ -37,7 +37,7 @@ global:
   # Define the image registry to use (may be blank for local images)
   imageRegistry: awsEcr
   imageTag: "latest"
-  pullSecretName: "None"
+  pullSecretName: aws-login-credentials
   # Update strategy should be "Recreate" or "Rolling Update"
   updateStrategy: Recreate
 

diff --git a/deploy/scripts/helm_utils.py b/deploy/scripts/helm_utils.py
@@ -45,7 +45,7 @@ def create_secrets(
 
 def get_installed_charts(helm_cmd: List[str], helm_namespace: str) -> List[str]:
     """Create a list of the helm charts that are already installed on the target."""
-    lookup_results = run_cmd(helm_cmd + ["list", "-n", helm_namespace, "-o", "yaml"])
+    lookup_results = run_cmd(helm_cmd + ["list", "-a", "-n", helm_namespace, "-o", "yaml"])
     chart_info: List[Dict[str, str]] = yaml.safe_load(lookup_results.stdout)
     chart_list: List[str] = []
     for chart in chart_info:

diff --git a/deploy/scripts/setup_combine.py b/deploy/scripts/setup_combine.py
@@ -176,8 +176,10 @@ def main() -> None:
             chart_namespace = config["charts"][chart]["namespace"]
             logging.debug(f"Namespace: {chart_namespace}")
             if add_namespace(chart_namespace, kube_env.get_kubectl_cmd()):
+                logging.debug(f"Namespace '{chart_namespace}' created")
                 installed_charts: List[str] = []
             else:
+                logging.debug(f"Namespace '{chart_namespace}' already exists")
                 # Get list of charts in target namespace
                 installed_charts = get_installed_charts(helm_cmd, chart_namespace)
             logging.debug(f"Installed charts: {installed_charts}")