Merge branch 'main' into enh/instance-list

Author: satra

.cirun.yml

@@ -7,7 +7,7 @@ runners:
     # Instance Type has 8 vcpu, 32 GiB memory, Up to 5 Gbps Network Performance
     instance_type: t3a.2xlarge
     # Custom Ubuntu 24.04 AMI with docker/hub pre-installed
-    machine_image: ami-01b494943951b97c7
+    machine_image: ami-028b291f28c6529f7
     # Region: Oregon
     region: us-west-2
     # Use Spot Instances for cost savings

src/_nebari/stages/infrastructure/template/local/main.tf

@@ -48,7 +48,7 @@ resource "kind_cluster" "default" {
 
     node {
       role  = "general"
-      image = "kindest/node:v1.29.2"
+      image = "kindest/node:v1.32.0"
     }
   }
 }

src/_nebari/stages/kubernetes_initialize/__init__.py

@@ -89,7 +89,9 @@ def input_vars(self, stage_outputs: Dict[str, Dict[str, Any]]):
                 for node_group in self.config.amazon_web_services.node_groups.values()
             )
             input_vars.gpu_node_group_names = [
-                group for group in self.config.amazon_web_services.node_groups.keys()
+                group
+                for group in self.config.amazon_web_services.node_groups.keys()
+                if self.config.amazon_web_services.node_groups[group].gpu
             ]
             input_vars.aws_region = self.config.amazon_web_services.region
 

src/_nebari/stages/kubernetes_initialize/template/modules/nvidia-installer/aws-nvidia-installer.tf

@@ -68,6 +68,13 @@ resource "kubernetes_daemonset" "aws_nvidia_installer" {
           operator = "Exists"
           effect   = "NoSchedule"
         }
+
+        toleration {
+          key      = "dedicated"
+          operator = "Equal"
+          value    = "nebari"
+          effect   = "NoSchedule"
+        }
       }
     }
 

src/_nebari/subcommands/deploy.py

@@ -23,12 +23,14 @@ def deploy(
             "-c",
             help="nebari configuration yaml file path",
         ),
-        output_directory: pathlib.Path = typer.Option(
-            "./",
-            "-o",
-            "--output",
-            help="output directory",
-        ),
+        # TODO: Remove -o/--output argument until it is safe to use
+        # See: https://github.com/nebari-dev/nebari/issues/1716
+        # output_directory: pathlib.Path = typer.Option(
+        #     "./",
+        #     "-o",
+        #     "--output",
+        #     help="output directory",
+        # ),
         dns_provider: Optional[str] = typer.Option(
             None,
             "--dns-provider",
@@ -76,7 +78,8 @@ def deploy(
         config = read_configuration(config_filename, config_schema=config_schema)
 
         if not disable_render:
-            render_template(output_directory, config, stages)
+            # Use hardcoded "./" since output_directory parameter was removed
+            render_template("./", config, stages)
 
         if skip_remote_state_provision:
             for stage in stages:

src/_nebari/subcommands/destroy.py

@@ -16,12 +16,14 @@ def destroy(
         config_filename: pathlib.Path = typer.Option(
             ..., "-c", "--config", help="nebari configuration file path"
         ),
-        output_directory: pathlib.Path = typer.Option(
-            "./",
-            "-o",
-            "--output",
-            help="output directory",
-        ),
+        # TODO: Remove -o/--output argument until it is safe to use
+        # See: https://github.com/nebari-dev/nebari/issues/1716
+        # output_directory: pathlib.Path = typer.Option(
+        #     "./",
+        #     "-o",
+        #     "--output",
+        #     help="output directory",
+        # ),
         disable_render: bool = typer.Option(
             False,
             "--disable-render",
@@ -47,7 +49,8 @@ def _run_destroy(
             config = read_configuration(config_filename, config_schema=config_schema)
 
             if not disable_render:
-                render_template(output_directory, config, stages)
+                # Use hardcoded "./" since output_directory parameter was removed
+                render_template("./", config, stages)
 
             destroy_configuration(config, stages)
 

src/_nebari/subcommands/render.py

@@ -12,12 +12,14 @@ def nebari_subcommand(cli: typer.Typer):
     @cli.command(rich_help_panel="Additional Commands")
     def render(
         ctx: typer.Context,
-        output_directory: pathlib.Path = typer.Option(
-            "./",
-            "-o",
-            "--output",
-            help="output directory",
-        ),
+        # TODO: Remove -o/--output argument until it is safe to use
+        # See: https://github.com/nebari-dev/nebari/issues/1716
+        # output_directory: pathlib.Path = typer.Option(
+        #     "./",
+        #     "-o",
+        #     "--output",
+        #     help="output directory",
+        # ),
         config_filename: pathlib.Path = typer.Option(
             ...,
             "-c",
@@ -39,4 +41,5 @@ def render(
         config_schema = nebari_plugin_manager.config_schema
 
         config = read_configuration(config_filename, config_schema=config_schema)
-        render_template(output_directory, config, stages, dry_run=dry_run)
+        # Use hardcoded "./" since output_directory parameter was removed
+        render_template("./", config, stages, dry_run=dry_run)