From 4d7475a3146b91ab51bfe6cf8ae419a70d9ff23a Mon Sep 17 00:00:00 2001 From: alhendrickson <159636032+alhendrickson@users.noreply.github.com.> Date: Wed, 26 Nov 2025 10:51:09 +0000 Subject: [PATCH] fix(ops): Workaround Azure Kubernetes module issue 55 --- .../aks-cluster/.terraform.lock.hcl | 103 +++++++----------- .../azure-kubernetes/aks-cluster/aks.tf | 13 ++- .../azure-kubernetes/aks-cluster/main.tf | 2 +- .../kubernetes-deployment/.terraform.lock.hcl | 19 ---- 4 files changed, 53 insertions(+), 84 deletions(-) diff --git a/deployment/terraform/examples/azure-kubernetes/aks-cluster/.terraform.lock.hcl b/deployment/terraform/examples/azure-kubernetes/aks-cluster/.terraform.lock.hcl index 7f17738..7e81134 100644 --- a/deployment/terraform/examples/azure-kubernetes/aks-cluster/.terraform.lock.hcl +++ b/deployment/terraform/examples/azure-kubernetes/aks-cluster/.terraform.lock.hcl @@ -2,22 +2,22 @@ # Manual edits may be lost in future updates. provider "registry.terraform.io/azure/azapi" { - version = "2.5.0" - constraints = ">= 2.0.0, < 3.0.0" + version = "2.7.0" + constraints = ">= 2.0.1, < 3.0.0" hashes = [ - "h1:Y22DrUlUHsHJPyo+2lqT+zmw7HRnlsAVeo7GvMVuDDM=", - "zh:24a2ebfec4a79b7ef122e07afe6ddda51ce91b3dbed7007757b9c53511976396", - "zh:2a26868f8243666b6d0cd29ea5d1b1ecfedb1bbccc3801d383ab7a3f7930aa69", - "zh:4c3ced3ce1f937dc5bcea61f638eee9134570af6cbe7e4db7c60d9bb517da689", - "zh:52acef0e6d57ed6e98a4ae587449071c91069d59387912f69ec008dfb48fd3bd", - "zh:658bc2e92374ca941a79df0e343599a7e8819a0ff5a5f47957acbf4ee524c751", - "zh:68e66d8b5ceb581a1919782492b7caf57334ea07a982ee4c440d92bb5af2b0b8", - "zh:94779341444106af22b5ca823e371c97480b17d1765aee236c81b4b4e96bbaa4", - "zh:9bbddd9312a8e0819c2262d640a6852be64414347f068ffe4513c09b36b7cfe7", - "zh:9d0319cf08c0aebfc20f88fd63aec39361d7b7044bf47296d97543daa7727344", - "zh:b201c491da70270299e1cfc40e26b01290dbe9ee8e36e12fa8a6b63393092803", - "zh:d0593258943e546c8c241b12232ab1e39e1741aebd7a02e4abfe910424a1d36b", - "zh:d489a31c3d1ee18111a6238484d1636a483024fa43c19468394ec8ec214ef503", + "h1:9zm0JfFV0ytSrVU2keJhcOjYQmxc/Qe6rFufuXQh8qk=", + "zh:190ffc8a59622307804c7530b589493bf38d8df38f83d992285dc5a9478e90d4", + "zh:3261c5429b33725eb22f87daa650a74ebb0a5ba1bda163e14f0305614a99fb81", + "zh:5addaacbcb06a927c55ff19e39faa32ecd623b7d5d7f058f46db8c38d4ec5d08", + "zh:6b642abe36c49d2f07f7290f4c9bdc1902e4e6f0252dfb2c41124713932f7409", + "zh:77edefaafa6754ddc61a8647e0474d529a355a93834f0b8966285ad42f11b312", + "zh:81376f1aed8f8166af35eaae8600ca9410e9479ecbf7ddd5cfaa39bdbb379cc0", + "zh:822156f8dadfe6ae3fb5f269129497f305eb90148fb3bf292ce7e9fe2951c410", + "zh:890ed09af73602d8d7357fb1aa95a8ab94be54423c1f1296d2dd45b5ab95d521", + "zh:b6a5edfa40f123b78663aef03f1634922bccd94383ea098d17794c5c5a45e4ba", + "zh:caf46fcde65e0e48797525583e62936986af4aa112f7bdc13442e42d9a91db68", + "zh:d6b2c97608a08cc93c477c9716fe10f909b3e911440a061ed5d0e92ae25468fe", + "zh:d9c9c7a5746bc22a39d08144797397ca8d55167b5dca3adbe8e97463bad60a45", ] } @@ -42,60 +42,41 @@ provider "registry.terraform.io/azure/modtm" { } provider "registry.terraform.io/hashicorp/azurerm" { - version = "4.38.1" + version = "4.54.0" constraints = ">= 4.0.0, < 5.0.0" hashes = [ - "h1:SwtMyUOvhuqrvoweQJNLPVvEc5iaagYS4GOJP4PfHBI=", - "zh:2d4085678cad85782b0097d2f1d03d96862deb3684b14a1125bd46b36091fd30", - "zh:3fe8037a4e94bc694caca4a68c0e15436dedc91b70aa95a06e2770e3e8dde6df", - "zh:4178b3783fca42ebac4435db3531bd23069723caf1509b0e915c524a4dee25d3", - "zh:61c6d21e854696c1c6d3fadce9aa9ab433e9a8791340760f9e8fdd1327d1a391", - "zh:8ef26b97aed168b7b91b868c1e4493a79cdbdc4ecb987f0e2a4e402ab6cb2474", - "zh:b4b1edfb49a36a109c69d661bb26b961fcdf50058690deed9d906c09254e5c1a", - "zh:b5e07b1c160cf0cefc2e4bc8d2b4c0a382dd76513797dc70b0c2fd3bee7b8495", - "zh:b87029f89e7d445c85ee7a8940f4a2740a745124802c461d1e51cd8b11d7c106", - "zh:c21d488f12aa6750f4525fc120b1405dd1a37f0b59586960e78beeb0e4fffcca", - "zh:cd1402d0e004e23c2ee36744fa26d4daafa291a05d5410b7beca6dc8c30857ba", - "zh:e8a7eb3d937d27e779ae426ac9f4529bdc7053634f219df8c76b2b8180fbed71", - "zh:f569b65999264a9416862bca5cd2a6177d94ccb0424f3a4ef424428912b9cb3c", - ] -} - -provider "registry.terraform.io/hashicorp/local" { - version = "2.5.3" - hashes = [ - "h1:1Nkh16jQJMp0EuDmvP/96f5Unnir0z12WyDuoR6HjMo=", - "zh:284d4b5b572eacd456e605e94372f740f6de27b71b4e1fd49b63745d8ecd4927", - "zh:40d9dfc9c549e406b5aab73c023aa485633c1b6b730c933d7bcc2fa67fd1ae6e", - "zh:6243509bb208656eb9dc17d3c525c89acdd27f08def427a0dce22d5db90a4c8b", + "h1:uYLSLApU3bG/q6nxNb2N5FV0YddZxsg6Jlq27hDmPOA=", + "zh:0adda2cfb2ae9ec394943164cbd5ab1f1fac89a0125ad3966a97363b06b1bd11", + "zh:23dcc71a1586c2b8644476ccd3b4d4d22aa651d6ceb03d32f801bb7ecb09c84f", + "zh:4573833c692a87df167e3adf71c4291879e1a5d2e430ba5255509d3510c7a2f5", + "zh:49132e138bb28b02aa36a00fdcfcf818c4a6d150e3b5148e4d910efac5aaf1bf", + "zh:5dda12ad7f69f91847b99365f66b8dfb1d6ea913d2d06fadbabcea236cc1b346", + "zh:6e45c59dbc54c56c1255f4bb45db15a2ec75dcb2a9125adfa812a667132b332a", + "zh:76802f69f1fa8e894e9c96d6f7098698d1f9c036f30b46a40207fce5ed373ef0", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:885d85869f927853b6fe330e235cd03c337ac3b933b0d9ae827ec32fa1fdcdbf", - "zh:bab66af51039bdfcccf85b25fe562cbba2f54f6b3812202f4873ade834ec201d", - "zh:c505ff1bf9442a889ac7dca3ac05a8ee6f852e0118dd9a61796a2f6ff4837f09", - "zh:d36c0b5770841ddb6eaf0499ba3de48e5d4fc99f4829b6ab66b0fab59b1aaf4f", - "zh:ddb6a407c7f3ec63efb4dad5f948b54f7f4434ee1a2607a49680d494b1776fe1", - "zh:e0dafdd4500bec23d3ff221e3a9b60621c5273e5df867bc59ef6b7e41f5c91f6", - "zh:ece8742fd2882a8fc9d6efd20e2590010d43db386b920b2a9c220cfecc18de47", - "zh:f4c6b3eb8f39105004cf720e202f04f57e3578441cfb76ca27611139bc116a82", + "zh:846e7222bdeee0150830d82cd2f09619e2239347eba1d05f0409c78a684502d8", + "zh:8822918829f89354ab65b1d588d3185191bbd81e3479510dcbec801d3e3617b0", + "zh:901074c726047a141e256e3229f3e55a5dd4033fec57f889c0118b71e818331b", + "zh:a240979f94f50d2f6ceda2651e5146652468f312f03691f0949876524d160a9d", ] } -provider "registry.terraform.io/hashicorp/null" { - version = "3.2.4" +provider "registry.terraform.io/hashicorp/local" { + version = "2.6.1" hashes = [ - "h1:hkf5w5B6q8e2A42ND2CjAvgvSN3puAosDmOJb3zCVQM=", - "zh:59f6b52ab4ff35739647f9509ee6d93d7c032985d9f8c6237d1f8a59471bbbe2", + "h1:LMoX85QLTgCCqRuy2aXoz47P7gZ4WRPSA00fUPC/Rho=", + "zh:10050d08f416de42a857e4b6f76809aae63ea4ec6f5c852a126a915dede814b4", + "zh:2df2a3ebe9830d4759c59b51702e209fe053f47453cb4688f43c063bac8746b7", + "zh:2e759568bcc38c86ca0e43701d34cf29945736fdc8e429c5b287ddc2703c7b18", + "zh:6a62a34e48500ab4aea778e355e162ebde03260b7a9eb9edc7e534c84fbca4c6", + "zh:74373728ba32a1d5450a3a88ac45624579e32755b086cd4e51e88d9aca240ef6", "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:795c897119ff082133150121d39ff26cb5f89a730a2c8c26f3a9c1abf81a9c43", - "zh:7b9c7b16f118fbc2b05a983817b8ce2f86df125857966ad356353baf4bff5c0a", - "zh:85e33ab43e0e1726e5f97a874b8e24820b6565ff8076523cc2922ba671492991", - "zh:9d32ac3619cfc93eb3c4f423492a8e0f79db05fec58e449dee9b2d5873d5f69f", - "zh:9e15c3c9dd8e0d1e3731841d44c34571b6c97f5b95e8296a45318b94e5287a6e", - "zh:b4c2ab35d1b7696c30b64bf2c0f3a62329107bd1a9121ce70683dec58af19615", - "zh:c43723e8cc65bcdf5e0c92581dcbbdcbdcf18b8d2037406a5f2033b1e22de442", - "zh:ceb5495d9c31bfb299d246ab333f08c7fb0d67a4f82681fbf47f2a21c3e11ab5", - "zh:e171026b3659305c558d9804062762d168f50ba02b88b231d20ec99578a6233f", - "zh:ed0fe2acdb61330b01841fa790be00ec6beaac91d41f311fb8254f74eb6a711f", + "zh:8dddae588971a996f622e7589cd8b9da7834c744ac12bfb59c97fa77ded95255", + "zh:946f82f66353bb97aefa8d95c4ca86db227f9b7c50b82415289ac47e4e74d08d", + "zh:e9a5c09e6f35e510acf15b666fd0b34a30164cecdcd81ce7cda0f4b2dade8d91", + "zh:eafe5b873ef42b32feb2f969c38ff8652507e695620cbaf03b9db714bee52249", + "zh:ec146289fa27650c9d433bb5c7847379180c0b7a323b1b94e6e7ad5d2a7dbe71", + "zh:fc882c35ce05631d76c0973b35adde26980778fc81d9da81a2fade2b9d73423b", ] } diff --git a/deployment/terraform/examples/azure-kubernetes/aks-cluster/aks.tf b/deployment/terraform/examples/azure-kubernetes/aks-cluster/aks.tf index 45beb72..e70dd5d 100644 --- a/deployment/terraform/examples/azure-kubernetes/aks-cluster/aks.tf +++ b/deployment/terraform/examples/azure-kubernetes/aks-cluster/aks.tf @@ -3,8 +3,15 @@ module "aks" { # Using the Azure Verified Module AKS Dev/Test module # This is not recommended by Azure to be used for production deployments - source = "Azure/avm-ptn-aks-dev/azurerm" - version = "0.2.0" + + # As of 26th 11 2025, the official module has a terminal bug on https://github.com/Azure/terraform-azurerm-avm-ptn-aks-dev/issues/55 + # This error is fixed in this PR, weitch back to the official module path when it's merged in + # https://github.com/Azure/terraform-azurerm-avm-ptn-aks-dev/pull/42 + # For now use the fork for that PR: + source = "github.com/pauldotyu/terraform-azurerm-avm-ptn-aks-dev" + + # source = "Azure/avm-ptn-aks-dev/azurerm" + # version = "0.2.0" name = module.naming.kubernetes_cluster.name_unique resource_group_name = azurerm_resource_group.this.name location = azurerm_resource_group.this.location @@ -49,4 +56,4 @@ module "aks" { # address_prefixes = ["10.31.129.0/24"] # } # } -# } \ No newline at end of file +# } diff --git a/deployment/terraform/examples/azure-kubernetes/aks-cluster/main.tf b/deployment/terraform/examples/azure-kubernetes/aks-cluster/main.tf index fc6cb18..64353d1 100644 --- a/deployment/terraform/examples/azure-kubernetes/aks-cluster/main.tf +++ b/deployment/terraform/examples/azure-kubernetes/aks-cluster/main.tf @@ -16,6 +16,6 @@ resource "azurerm_resource_group" "this" { resource "local_file" "kubeconfig_file" { content = module.aks.resource.kube_config_raw - filename = "${local.kubeconfig_file}.yaml" + filename = "${local.kubeconfig_file}" file_permission = "0600" } diff --git a/deployment/terraform/examples/azure-kubernetes/kubernetes-deployment/.terraform.lock.hcl b/deployment/terraform/examples/azure-kubernetes/kubernetes-deployment/.terraform.lock.hcl index 9d4f8b7..5c1f1cd 100644 --- a/deployment/terraform/examples/azure-kubernetes/kubernetes-deployment/.terraform.lock.hcl +++ b/deployment/terraform/examples/azure-kubernetes/kubernetes-deployment/.terraform.lock.hcl @@ -21,25 +21,6 @@ provider "registry.terraform.io/hashicorp/helm" { ] } -provider "registry.terraform.io/hashicorp/http" { - version = "3.5.0" - hashes = [ - "h1:8bUoPwS4hahOvzCBj6b04ObLVFXCEmEN8T/5eOHmWOM=", - "zh:047c5b4920751b13425efe0d011b3a23a3be97d02d9c0e3c60985521c9c456b7", - "zh:157866f700470207561f6d032d344916b82268ecd0cf8174fb11c0674c8d0736", - "zh:1973eb9383b0d83dd4fd5e662f0f16de837d072b64a6b7cd703410d730499476", - "zh:212f833a4e6d020840672f6f88273d62a564f44acb0c857b5961cdb3bbc14c90", - "zh:2c8034bc039fffaa1d4965ca02a8c6d57301e5fa9fff4773e684b46e3f78e76a", - "zh:5df353fc5b2dd31577def9cc1a4ebf0c9a9c2699d223c6b02087a3089c74a1c6", - "zh:672083810d4185076c81b16ad13d1224b9e6ea7f4850951d2ab8d30fa6e41f08", - "zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3", - "zh:7b4200f18abdbe39904b03537e1a78f21ebafe60f1c861a44387d314fda69da6", - "zh:843feacacd86baed820f81a6c9f7bd32cf302db3d7a0f39e87976ebc7a7cc2ee", - "zh:a9ea5096ab91aab260b22e4251c05f08dad2ed77e43e5e4fadcdfd87f2c78926", - "zh:d02b288922811739059e90184c7f76d45d07d3a77cc48d0b15fd3db14e928623", - ] -} - provider "registry.terraform.io/hashicorp/kubernetes" { version = "2.38.0" hashes = [