Merge branch 'master' of github.com:Ensono/stacks-terraform into feat…

…/domain-setup
Ensono · Jul 15, 2024 · 38113af · 38113af
2 parents dd9c7ae + 86bb89f
commit 38113af
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/azurerm/modules/azurerm-aks/aks.tf b/azurerm/modules/azurerm-aks/aks.tf
@@ -6,6 +6,7 @@ resource "azurerm_container_registry" "registry" {
   location            = var.resource_group_location
   admin_enabled       = var.registry_admin_enabled
   sku                 = var.registry_sku
+
   lifecycle {
     ignore_changes = [
       tags,
@@ -27,7 +28,9 @@ resource "azurerm_kubernetes_cluster" "default" {
   resource_group_name     = azurerm_resource_group.default.name
   dns_prefix              = var.dns_prefix
   kubernetes_version      = var.cluster_version
+  sku_tier                = var.cluster_sku_tier
   private_cluster_enabled = var.private_cluster_enabled
+
   linux_profile {
     admin_username = var.admin_username
     ssh_key {

diff --git a/azurerm/modules/azurerm-aks/variables.tf b/azurerm/modules/azurerm-aks/variables.tf
@@ -177,7 +177,7 @@ variable "dns_parent_zone" {
   type        = string
   description = "Dns zone name for the parnet - e.g. domain.com. NOTE: you need control over this domain to add the records here"
 
-  default = ""
+  default = null
 }
 
 variable "dns_parent_ns_ttl" {
@@ -243,6 +243,18 @@ variable "cluster_version" {
   default = "1.24.6"
 }
 
+variable "cluster_sku_tier" {
+  description = "The Control Plane SKU Tier"
+  type        = string
+
+  validation {
+    condition     = contains(["Free", "Standard", "Premium"], var.cluster_sku_tier)
+    error_message = "Must be one of Free, Standard, or Premium."
+  }
+
+  default = "Free"
+}
+
 variable "cluster_name" {
   description = "Name for the cluster"
   type        = string