diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index 55e0f34..2e2f7b0 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -2,61 +2,61 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/hashicorp/azuread" { - version = "2.39.0" - constraints = "~> 2.39.0" + version = "2.43.0" + constraints = "~> 2.43.0" hashes = [ - "h1:eArrGnAP438ajO6peHLzDZxHI+mFiHeT82pObfpgObs=", - "zh:11d03e0bdcb372dcbebbfac53b71526ca3a2e4d280103a43f4294be66f264b96", + "h1:bp9HeofaEJDiWtyLMwIEYVgxP5yoMs/dQhjCYsbXU34=", "zh:1c3e89cf19118fc07d7b04257251fc9897e722c16e0a0df7b07fcd261f8c12e7", - "zh:1e1e40cb7b3028fec4a1527c9f74b29f80bca5f365a1c8bc2eb4374d48f7efcd", - "zh:1e2418804ca6af82d1b222c2177579bceba869f75c2411316774f0f937aca39a", - "zh:273f67427b5fdb23e074ebc017422995e184b58fb36e441ea5a059e6846461f5", - "zh:27f4b16e829608a675f056dea93997662eeebe5297dce1d19add8dc8b0842596", - "zh:40c2b2797c993e4b003d1ad2aa0105040401ca48d85a8cda6e885fed30de1cb7", - "zh:6f069afbc76c577447721bca164bb98ebb83de35650b09ccee38040d80493ca4", - "zh:9ac84becff0e48062f26e9b35cb91f706341f587c0cf2ab2c2971cc14f51f8dd", - "zh:a54119d7a4838f5aa282aa0b2d7c8db8c9defaf876142b8f40b337930b507457", - "zh:aa2ce28f3555f3e1fb183d12a03cdc9d64940f017ab6dd67cb414ade02df6c56", - "zh:befac5781b062e79be6e1a6407892f7e5368baf3f32e3bc6cf6c74a73f43f09d", + "zh:2225e2e97ccba4ed1d84f1d430f1ebd837943fe187e57f24f1763172dda61556", + "zh:24708cb09411a766ff397e05cae49058ca38edc718db303a7faef9823402737d", + "zh:3a61167ff58d585abd56233731a8fd649c7c04272bd5b878f963883496e19192", + "zh:433f557634b5e663caaeb68c504c7771c186eba7ecf5d4030437956bc6599ecb", + "zh:5e8cc3b3bcc22d217cf588c821ce091c7d40f0815aecc1addde5355c17cb381d", + "zh:7b008c376097cd60259d43f58fcb33fee56fe9aebb4a94ed7958868ee501d7d0", + "zh:908907fd38537583ea60dccbf73055ae1a2963acc399be4f8e9a6616a9a537db", + "zh:966586cfd850606bab7dd2242c5b9e35d3a7178f64eaac0b44dea54c104c8169", + "zh:a624286401913d3ec44b4825e2c5ae38ac94fb4950aeed8f4b91d09c898f8cce", + "zh:b5171a4463fd0d9b0ce2a08605499b6d99fe93d6fc3f4143e9a26201065cc90a", + "zh:cdcfeeb9db4dbdc6f1fb5644453b37dbd0025b4f3127e9ff348f1e62d66b493e", ] } provider "registry.terraform.io/hashicorp/azurerm" { - version = "3.72.0" - constraints = "~> 3.72.0" + version = "3.75.0" + constraints = "~> 3.75.0" hashes = [ - "h1:KowUJ0RB59RdiX+K65FHOVrTURuKbMfemLJU56jnWzc=", - "zh:0750326f82dc0765cd9dc0e142b4c325be7918beeacc0b887510274f15d76311", - "zh:10ba452905de646181bfbbb9555c7b8fb96138ddc4bb42227521c402c3b12213", - "zh:25c8198603cffa0920e6ae39a87a5bb4af75bbe1fba36156e8077ae50261a7ca", - "zh:5c294fff683c2fc292f502da43f41bf4b68a20bf60a2e92723768a0ce7fe2c7a", - "zh:84449a0e7d5bd4a3fda9a4c9ad287c4c7ebcc5ede406d3ab7593f073d40abdfc", - "zh:89f3fc2b3e84e45776fce547ed9fa3dbdba65fe243094fe308c5cef273b4d980", - "zh:a8cdfc816fbf14a230c3bb4ccdf70d19069186de78008e49dc9dfaa8aaf0208e", - "zh:d6e1d86f2d6d0e09d3961f10f9e26e24a25d39e98ecaf93d5cb089ddb4fea5b6", - "zh:e74f0e6c3904da8ff10bdb90be1fd8b20f1d3f14d62d24ffb76b61c623ee0e3c", - "zh:e9fb32ef48450b8109e30e47280053ca7d5307190bf6f516e1bebaf556dc8d81", - "zh:ee8c9bb7aa318a3d8a313eb032b3fc1a332114fe112723ba7b0c8cb4a5947476", + "h1:jdCddD1ADiQQB/rjC2aB7fFzOMZswHRPcVVC6YmL5K0=", + "zh:0d881d7b499367400ced6e315e32a1948d823309c5677a16056367001a8785ce", + "zh:384acba136f1b347cac7831bb4e0396a370f6664e1c1242fce42a6fc55b9db8a", + "zh:409a01af5d873e4ac7e62cfd8c9a27638a719394ccf6a8de89ac4a1049275c20", + "zh:547eab553ea24cc9079fd80093c1611d036df089385bb4a38c5db21f6126e75e", + "zh:714a1fc3d1485deec10f4a49be556997f8ea0cc717db78fa0613f5bee728fcd7", + "zh:90d197c03a3bad2a8cfa7fc2396dc1601bf08be9368d399d58ec51654201c6fb", + "zh:9587b44249147b0e9d7619568cf46de126ec947ca5c56a1d740d8142b89919c2", + "zh:9d910ae66496833d4f85a4fe6b24649f74a1624f1502f63e9ff8201f29c0c1d1", + "zh:9f355767fc7f5ab769a60b46e42f9498f33ee95c3833b7d95c7f7c69fe101564", + "zh:d11d91da699d8c62f873cdea72bc26ab40cde4f18bc88ab6583ea836fee26ecd", + "zh:e0f9d50274f54acc2c5e300537d96a5aa03be650cfb66249a14ed45375014c77", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", ] } provider "registry.terraform.io/hashicorp/kubernetes" { - version = "2.16.1" - constraints = "~> 2.16.0" + version = "2.23.0" + constraints = "~> 2.23.0" hashes = [ - "h1:i+DwtJK82sIWmTcQA9lL0mlET+14/QpUqv10fU2o3As=", - "zh:06224975f5910d41e73b35a4d5079861da2c24f9353e3ebb015fbb3b3b996b1c", - "zh:2bc400a8d9fe7755cca27c2551564a9e2609cfadc77f526ef855114ee02d446f", - "zh:3a479014187af1d0aec3a1d3d9c09551b801956fe6dd29af1186dec86712731b", - "zh:73fb0a69f1abdb02858b6589f7fab6d989a0f422f7ad95ed662aaa84872d3473", - "zh:a33852cd382cbc8e06d3f6c018b468ad809d24d912d64722e037aed1f9bf39db", - "zh:b533ff2214dca90296b1d22eace7eaa7e3efe5a7ae9da66a112094abc932db4f", - "zh:ddf74d8bb1aeb01dc2c36ef40e2b283d32b2a96db73f6daaf179fa2f10949c80", - "zh:e720f3a15d34e795fa9ff90bc755e838ebb4aef894aa2a423fb16dfa6d6b0667", - "zh:e789ae70a658800cb0a19ef7e4e9b26b5a38a92b43d1f41d64fc8bb46539cefb", - "zh:e8aed7dc0bd8f843d607dee5f72640dbef6835a8b1c6ea12cea5b4ec53e463f7", + "h1:xyFc77aYkPoU4Xt1i5t0B1IaS8TbTtp9aCSuQKDayII=", + "zh:10488a12525ed674359585f83e3ee5e74818b5c98e033798351678b21b2f7d89", + "zh:1102ba5ca1a595f880e67102bbf999cc8b60203272a078a5b1e896d173f3f34b", + "zh:1347cf958ed3f3f80b3c7b3e23ddda3d6c6573a81847a8ee92b7df231c238bf6", + "zh:2cb18e9f5156bc1b1ee6bc580a709f7c2737d142722948f4a6c3c8efe757fa8d", + "zh:5506aa6f28dcca2a265ccf8e34478b5ec2cb43b867fe6d93b0158f01590fdadd", + "zh:6217a20686b631b1dcb448ee4bc795747ebc61b56fbe97a1ad51f375ebb0d996", + "zh:8accf916c00579c22806cb771e8909b349ffb7eb29d9c5468d0a3f3166c7a84a", + "zh:9379b0b54a0fa030b19c7b9356708ec8489e194c3b5e978df2d31368563308e5", + "zh:aa99c580890691036c2931841e88e7ee80d59ae52289c8c2c28ea0ac23e31520", + "zh:c57376d169875990ac68664d227fb69cd0037b92d0eba6921d757c3fd1879080", + "zh:e6068e3f94f6943b5586557b73f109debe19d1a75ca9273a681d22d1ce066579", "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - "zh:fb3ac4f43c8b0dfc0b0103dd0f062ea72b3a34518d4c8808e3a44c9a3dd5f024", ] } diff --git a/README.md b/README.md index 333e540..0d95e79 100644 --- 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 index b13ef18..c2e0fa2 100644 --- 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 index 39baa9b..6bc0264 100644 --- 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 index 06c7f1e..148931c 100644 --- 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 index 1bc7724..71a0270 100644 --- 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 index 97b31b7..985140c 100644 --- 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 index 9d75558..13aaaa5 100644 --- 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 index f7af037..036150e 100644 --- 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" {