Merge branch 'main' into add-docs-s3-lb-prerequisites

defenseunicorns · Jan 29, 2025 · 19eed44 · 19eed44
2 parents f968164 + df19314
commit 19eed44
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 6 deletions.
diff --git a/.github/test-infra/azure/aks/main.tf b/.github/test-infra/azure/aks/main.tf
@@ -55,8 +55,8 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
     name                 = var.default_node_pool_name
     auto_scaling_enabled = var.enable_autoscaling
     vnet_subnet_id       = azurerm_subnet.cluster_node_subnet.id
-    max_count            = var.autoscaling_max_node_count
-    min_count            = var.autoscaling_min_node_count
+    max_count            = var.enable_autoscaling ? var.autoscaling_max_node_count : null
+    min_count            = var.enable_autoscaling ? var.autoscaling_max_node_count : null
     vm_size              = var.default_node_pool_vm_size
     zones                = var.default_node_pool_availability_zones
     node_labels          = var.default_node_pool_node_labels
@@ -106,3 +106,13 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
     azurerm_resource_group.this
   ]
 }
+
+resource "azurerm_kubernetes_cluster_node_pool" "worker" {
+  name                  = "worker1"
+  mode                  = "User"
+  kubernetes_cluster_id = azurerm_kubernetes_cluster.aks_cluster.id
+  vm_size               = var.worker_pool_vm_size
+  auto_scaling_enabled  = var.enable_autoscaling
+  min_count             = var.enable_autoscaling ? var.autoscaling_min_node_count_worker : null
+  max_count             = var.enable_autoscaling ? var.autoscaling_max_node_count_worker : null
+}
diff --git a/.github/test-infra/azure/aks/variables.tf b/.github/test-infra/azure/aks/variables.tf
@@ -25,7 +25,7 @@ variable "dns_prefix" {
 
 variable "sku_tier" {
   description = "(Optional) The SKU Tier that should be used for this Kubernetes Cluster. Possible values are Free and Standard (which includes the Uptime SLA), and Premium. Defaults to Free."
-  default     = "Standard"
+  default     = "Free"
   type        = string
 
   validation {
@@ -43,19 +43,31 @@ variable "kubernetes_version" {
 variable "enable_autoscaling" {
   description = "(Optional) Enable cluster-autoscaler on all nodepools. Defaults to true."
   type        = bool
-  default     = true
+  default     = false
 }
 
 variable "autoscaling_max_node_count" {
   description = "The maximum number of nodes to allow the default (system) node pool to scale up to."
   type        = number
-  default     = 6
+  default     = 3
+}
+
+variable "autoscaling_max_node_count_worker" {
+  description = "The maximum number of nodes to allow the worker (user) node pool to scale up to."
+  type        = number
+  default     = 3
 }
 
 variable "autoscaling_min_node_count" {
   description = "The minimum number of nodes that should always be present in the default (system) node pool."
   type        = number
-  default     = 4
+  default     = 2
+}
+
+variable "autoscaling_min_node_count_worker" {
+  description = "The minimum number of nodes that should always be present in the worker (user) node pool."
+  type        = number
+  default     = 3
 }
 
 variable "default_node_pool_vm_size" {
@@ -64,6 +76,12 @@ variable "default_node_pool_vm_size" {
   type        = string
 }
 
+variable "worker_pool_vm_size" {
+  description = "Specifies the vm size of the worker node pool"
+  default     = "Standard_F8s_v2"
+  type        = string
+}
+
 variable "default_node_pool_availability_zones" {
   description = "Specifies the availability zones of the default node pool"
   default     = ["1", "2", "3"]

diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
@@ -46,7 +46,11 @@ tasks:
         default: base
         description: The UDS Core layer to deploy
     actions:
+      - description: "Deploy UDS Core Base Layer without Ambient (must set UDS_LAYER environment variable)"
+        if: ${{ eq .inputs.layer "base"}}
+        cmd: uds zarf package deploy build/zarf-package-core-${{ index .inputs "layer" }}-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress --components '-istio-ambient,*'
       - description: "Deploy a single UDS Core Layer (must set UDS_LAYER environment variable)"
+        if: ${{ ne .inputs.layer "base"}}
         cmd: uds zarf package deploy build/zarf-package-core-${{ index .inputs "layer" }}-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress --components '*'
 
   - name: latest-package-release