Merge pull request #27 from avinor/change-upgrade-default-values

Change upgrade default values and upgrade providers
avinor · Oct 4, 2023 · 8093279 · 8093279
2 parents 66d4aec + 2c0dbe4
commit 8093279
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 72 deletions.
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/README.md b/README.md
@@ -19,13 +19,13 @@ This example deploys a simple cluster with one node pool.
 ```terraform
 module "simple" {
   source  = "avinor/kubernetes/azurerm"
-  version = "6.0.0"
+  version = "6.0.1"
 
   name                    = "simple"
   resource_group_name     = "simple-aks-rg"
   location                = "westeurope"
   service_cidr            = "10.0.0.0/24"
-  kubernetes_version      = "1.15.5"
+  kubernetes_version      = "1.27.3"
 
   agent_pools = [
     {

diff --git a/examples/addons/main.tf b/examples/addons/main.tf
@@ -5,12 +5,12 @@ module "addon" {
   resource_group_name     = "addons-aks-rg"
   location                = "westeurope"
   service_cidr            = "10.241.0.0/24"
-  kubernetes_version      = "1.23.8"
+  kubernetes_version      = "1.27.3"
 
   agent_pools = [
     {
       name                 = "linux"
-      orchestrator_version = "1.18.14"
+      orchestrator_version = "1.27.3"
       vnet_subnet_id       = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysub"
     },
   ]

diff --git a/examples/diagnostics/main.tf b/examples/diagnostics/main.tf
@@ -5,12 +5,12 @@ module "diagnostics" {
   resource_group_name     = "diagnostics-aks-rg"
   location                = "westeurope"
   service_cidr            = "10.241.0.0/24"
-  kubernetes_version      = "1.18.14"
+  kubernetes_version      = "1.27.3"
 
   agent_pools = [
     {
       name                 = "linux"
-      orchestrator_version = "1.18.14"
+      orchestrator_version = "1.27.3"
       vnet_subnet_id       = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysub"
     },
   ]

diff --git a/examples/rbac/main.tf b/examples/rbac/main.tf
@@ -5,13 +5,13 @@ module "rbac" {
   resource_group_name     = "rbac-aks-rg"
   location                = "norwayeast"
   service_cidr            = "10.241.0.0/24"
-  kubernetes_version      = "1.18.14"
+  kubernetes_version      = "1.27.3"
   azure_rbac_enabled      = true
 
   agent_pools = [
     {
       name                 = "linux"
-      orchestrator_version = "1.25.6"
+      orchestrator_version = "1.27.3"
       vnet_subnet_id       = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysub"
     },
   ]

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -5,12 +5,12 @@ module "simple" {
   resource_group_name     = "simple-aks-rg"
   location                = "westeurope"
   service_cidr            = "10.241.0.0/24"
-  kubernetes_version      = "1.18.14"
+  kubernetes_version      = "1.27.3"
 
   agent_pools = [
     {
       name                 = "linux"
-      orchestrator_version = "1.18.14"
+      orchestrator_version = "1.27.3"
       vnet_subnet_id       = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysub"
     },
   ]

diff --git a/examples/upgrade/main.tf b/examples/upgrade/main.tf
@@ -5,21 +5,13 @@ module "upgrade" {
   resource_group_name     = "upgrade-aks-rg"
   location                = "westeurope"
   service_cidr            = "10.241.0.0/24"
-  kubernetes_version      = "1.18.14"
+  kubernetes_version      = "1.27.3"
   node_os_channel_upgrade = "Unmanaged"
 
-  maintenance_window_node_os = {
-    frequency   = "Weekly"
-    interval    = 1
-    duration    = 4
-    day_of_week = "Sunday"
-    start_time  = "01:00"
-  }
-
   agent_pools = [
     {
       name                 = "linux"
-      orchestrator_version = "1.18.14"
+      orchestrator_version = "1.27.3"
       vnet_subnet_id       = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/mygroup1/providers/Microsoft.Network/virtualNetworks/myvnet1/subnets/mysub"
     },
   ]

diff --git a/main.tf b/main.tf
@@ -3,15 +3,15 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "~> 2.16.0"
+      version = "~> 2.23.0"
     }
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "~> 3.72.0"
+      version = "~> 3.75.0"
     }
     azuread = {
       source  = "hashicorp/azuread"
-      version = "~> 2.39.0"
+      version = "~> 2.43.0"
     }
   }
 }

diff --git a/variables.tf b/variables.tf
@@ -20,7 +20,7 @@ variable "kubernetes_version" {
 
 variable "node_os_channel_upgrade" {
   description = "The upgrade channel for this Kubernetes Cluster Nodes' OS Image."
-  default     = "Unmanaged"
+  default     = "NodeImage"
 }
 
 variable "maintenance_window_node_os" {
@@ -32,12 +32,7 @@ variable "maintenance_window_node_os" {
     day_of_week = optional(string) # Required if frequency is weekly.
     start_time  = optional(string)
   })
-  default = {
-    frequency  = "Daily"
-    interval   = 1
-    duration   = 4
-    start_time = "00:00" # UTC
-  }
+  default = null
 }
 
 variable "node_resource_group" {