more wip changes

Author: josibake

resources/charts/namespaces/values.yaml

@@ -1,4 +1,5 @@
 type: "assets"
+namespaceName: "default-warnet-value"
 users:
   - name: warnet-user
     roles:

src/warnet/constants.py

@@ -14,14 +14,15 @@
 DEFAULT_NAMESPACE = "warnet"
 LOGGING_NAMESPACE = "warnet-logging"
 INGRESS_NAMESPACE = "ingress"
-HELM_COMMAND = "helm upgrade --install --create-namespace"
+HELM_COMMAND = "helm upgrade --install"
 
 # labels are applied to namespaces to help filter commands without relying on naming conventions
 # on the namespaces themselves. Namespaces containing tanks and commanders get the WARNET_ASSETS tag
 # whereas logging namespaces get the WARNET_LOGGING tag, and admin namespaces get the WARNET_ADMIN tag
 WARNET_ASSETS = "assets"
 WARNET_LOGGING = "logging"
 WARNET_ADMIN = "admin"
+WARNET_NAMESPACE_ANNOTATION = "dontremember"
 
 
 # Directories and files for non-python assets, e.g., helm charts, example scenarios, default configs

src/warnet/deploy.py

@@ -59,7 +59,7 @@ def deploy(directory, debug, namespace):
         if namespace:
             click.echo("Cannot specify a --namespace when deploying a namespaces chart.")
         else:
-            deploy_namespaces(directory)
+            deploy_namespaces(directory, debug)
     else:
         click.echo(
             "Error: Neither network.yaml nor namespaces.yaml found in the specified directory."
@@ -233,21 +233,21 @@ def deploy_network(directory: Path, namespace_override: str, debug: bool = False
                 Path(temp_override_file_path).unlink()
 
 
-def deploy_namespaces(directory: Path):
+def deploy_namespaces(directory: Path, debug: bool = False):
     namespaces_file_path = directory / NAMESPACES_FILE
     defaults_file_path = directory / DEFAULTS_NAMESPACE_FILE
 
     with namespaces_file_path.open() as f:
         namespaces_file = yaml.safe_load(f)
 
     for namespace in namespaces_file["namespaces"]:
-        click.echo(f"Deploying namespace: {namespace.get('name')}")
+        click.echo(f"Deploying namespace: {namespace.get('namespaceName')}")
         try:
             temp_override_file_path = Path()
-            namespace_name = namespace.get("name")
-            namespace_config_override = {k: v for k, v in namespace.items() if k != "name"}
+            namespace_name = namespace.get("namespaceName")
+            namespace_config_override = {k: v for k, v in namespace.items()}
 
-            cmd = f"{HELM_COMMAND} {namespace_name} {NAMESPACES_CHART_LOCATION} -f {defaults_file_path} --set type={WARNET_ASSETS}"
+            cmd = f"{HELM_COMMAND} --create-namespace {namespace_name} {NAMESPACES_CHART_LOCATION} -f {defaults_file_path} --set type={WARNET_ASSETS}"
 
             if namespace_config_override:
                 with tempfile.NamedTemporaryFile(
@@ -257,6 +257,9 @@ def deploy_namespaces(directory: Path):
                     temp_override_file_path = Path(temp_file.name)
                 cmd = f"{cmd} -f {temp_override_file_path}"
 
+            if debug:
+                cmd += " --debug"
+
             if not stream_command(cmd):
                 click.echo(f"Failed to run Helm command: {cmd}")
                 return
@@ -266,6 +269,7 @@ def deploy_namespaces(directory: Path):
         finally:
             if temp_override_file_path.exists():
                 temp_override_file_path.unlink()
+    print("DONE!!!!!")
 
 
 def is_windows():