diff --git a/CHANGELOG.md b/CHANGELOG.md index 9560be61..037d5951 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ **Merged pull requests:** +- Add support for `node_os_channel_upgrade` [\#474](https://github.com/Azure/terraform-azurerm-aks/pull/474) ([lonegunmanb](https://github.com/lonegunmanb)) - use lowercase everywhere for network plugin mode overlay [\#472](https://github.com/Azure/terraform-azurerm-aks/pull/472) ([zioproto](https://github.com/zioproto)) - Bump github.com/Azure/terraform-module-test-helper from 0.15.1-0.20230728050712-96e8615f5515 to 0.17.0 in /test [\#469](https://github.com/Azure/terraform-azurerm-aks/pull/469) ([dependabot[bot]](https://github.com/apps/dependabot)) - Add support for `service_mesh_profile` block [\#468](https://github.com/Azure/terraform-azurerm-aks/pull/468) ([lonegunmanb](https://github.com/lonegunmanb)) diff --git a/examples/multiple_node_pools/TestRecord.md b/examples/multiple_node_pools/TestRecord.md index 51f700dd..ef0bb917 100644 --- a/examples/multiple_node_pools/TestRecord.md +++ b/examples/multiple_node_pools/TestRecord.md @@ -1,3 +1,23 @@ +## 13 Nov 23 14:19 UTC + +Success: true + +### Versions + +Terraform v1.6.1 +on linux_amd64 ++ provider registry.terraform.io/azure/azapi v1.10.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.80.0 ++ provider registry.terraform.io/hashicorp/null v3.2.1 ++ provider registry.terraform.io/hashicorp/random v3.3.2 ++ provider registry.terraform.io/hashicorp/tls v4.0.4 + +### Error + + + +--- + ## 07 Nov 23 07:03 UTC Success: true diff --git a/examples/named_cluster/TestRecord.md b/examples/named_cluster/TestRecord.md index cf6ba8dc..7da86431 100644 --- a/examples/named_cluster/TestRecord.md +++ b/examples/named_cluster/TestRecord.md @@ -1,3 +1,24 @@ +## 13 Nov 23 15:12 UTC + +Success: true + +### Versions + +Terraform v1.6.1 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.10.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.80.0 ++ provider registry.terraform.io/hashicorp/null v3.2.1 ++ provider registry.terraform.io/hashicorp/random v3.3.2 ++ provider registry.terraform.io/hashicorp/tls v4.0.4 + +### Error + + + +--- + ## 07 Nov 23 08:00 UTC Success: true diff --git a/examples/startup/TestRecord.md b/examples/startup/TestRecord.md index 6bcc6f45..3c19a628 100644 --- a/examples/startup/TestRecord.md +++ b/examples/startup/TestRecord.md @@ -1,3 +1,24 @@ +## 13 Nov 23 14:44 UTC + +Success: true + +### Versions + +Terraform v1.6.1 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.10.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.80.0 ++ provider registry.terraform.io/hashicorp/null v3.2.1 ++ provider registry.terraform.io/hashicorp/random v3.3.2 ++ provider registry.terraform.io/hashicorp/tls v4.0.4 + +### Error + + + +--- + ## 07 Nov 23 07:28 UTC Success: true diff --git a/examples/with_acr/TestRecord.md b/examples/with_acr/TestRecord.md index 05413e33..03cbb21e 100644 --- a/examples/with_acr/TestRecord.md +++ b/examples/with_acr/TestRecord.md @@ -1,3 +1,23 @@ +## 13 Nov 23 14:19 UTC + +Success: true + +### Versions + +Terraform v1.6.1 +on linux_amd64 ++ provider registry.terraform.io/azure/azapi v1.10.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.80.0 ++ provider registry.terraform.io/hashicorp/null v3.2.1 ++ provider registry.terraform.io/hashicorp/random v3.3.2 ++ provider registry.terraform.io/hashicorp/tls v4.0.4 + +### Error + + + +--- + ## 07 Nov 23 06:59 UTC Success: true diff --git a/examples/without_monitor/TestRecord.md b/examples/without_monitor/TestRecord.md index 8c47c41c..c84c5303 100644 --- a/examples/without_monitor/TestRecord.md +++ b/examples/without_monitor/TestRecord.md @@ -1,3 +1,24 @@ +## 13 Nov 23 15:10 UTC + +Success: true + +### Versions + +Terraform v1.6.1 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.10.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.80.0 ++ provider registry.terraform.io/hashicorp/null v3.2.1 ++ provider registry.terraform.io/hashicorp/random v3.3.2 ++ provider registry.terraform.io/hashicorp/tls v4.0.4 + +### Error + + + +--- + ## 07 Nov 23 07:49 UTC Success: true diff --git a/main.tf b/main.tf index e472b645..bbbf2b7b 100644 --- a/main.tf +++ b/main.tf @@ -38,20 +38,16 @@ resource "azurerm_kubernetes_cluster" "main" { role_based_access_control_enabled = var.role_based_access_control_enabled run_command_enabled = var.run_command_enabled sku_tier = var.sku_tier - tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_git_commit = "99803f7459dec967a852f846498cad2583564533" - avm_git_file = "main.tf" - avm_git_last_modified_at = "2023-11-02 07:48:26" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "859d38b1-860e-4ce2-ad14-6c7da0ddd3bf" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_yor_name = "main" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/)) + tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_git_commit = "678838cb66e8ae110c0e5057465b6341033e1aef" + avm_git_file = "main.tf" + avm_git_last_modified_at = "2023-11-13 03:03:50" + avm_git_org = "Azure" + avm_git_repo = "terraform-azurerm-aks" + avm_yor_trace = "2449d1f1-c2ba-4a57-8d75-b012e2aabc53" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_yor_name = "main" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/)) workload_identity_enabled = var.workload_identity_enabled dynamic "default_node_pool" { @@ -613,20 +609,16 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" { scale_down_mode = each.value.scale_down_mode snapshot_id = each.value.snapshot_id spot_max_price = each.value.spot_max_price - tags = merge(each.value.tags, (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_git_commit = "bc0c9fab9ee53296a64c7a682d2ed7e0726c6547" - avm_git_file = "main.tf" - avm_git_last_modified_at = "2023-05-04 05:02:32" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "ebb72772-ec89-44c3-ba73-8a84d7cc9c47" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_yor_name = "node_pool" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/)) + tags = merge(each.value.tags, (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_git_commit = "bc0c9fab9ee53296a64c7a682d2ed7e0726c6547" + avm_git_file = "main.tf" + avm_git_last_modified_at = "2023-05-04 05:02:32" + avm_git_org = "Azure" + avm_git_repo = "terraform-azurerm-aks" + avm_yor_trace = "4fd87354-cdf7-4386-b7e6-dcbfb69284d1" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_yor_name = "node_pool" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/)) ultra_ssd_enabled = each.value.ultra_ssd_enabled vnet_subnet_id = each.value.vnet_subnet_id workload_runtime = each.value.workload_runtime @@ -761,20 +753,16 @@ resource "azurerm_log_analytics_workspace" "main" { resource_group_name = coalesce(var.log_analytics_workspace_resource_group_name, var.resource_group_name) retention_in_days = var.log_retention_in_days sku = var.log_analytics_workspace_sku - tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_git_commit = "0ae8a663f1dc1dc474b14c10d9c94c77a3d1e234" - avm_git_file = "main.tf" - avm_git_last_modified_at = "2023-06-05 02:21:33" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "aad634ac-2ab7-4b34-b61e-fc9f1afe402a" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_yor_name = "main" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/)) + tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_git_commit = "0ae8a663f1dc1dc474b14c10d9c94c77a3d1e234" + avm_git_file = "main.tf" + avm_git_last_modified_at = "2023-06-05 02:21:33" + avm_git_org = "Azure" + avm_git_repo = "terraform-azurerm-aks" + avm_yor_trace = "ca92355a-8390-4ae3-90c6-9f5c1c006545" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_yor_name = "main" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/)) lifecycle { precondition { @@ -806,20 +794,16 @@ resource "azurerm_log_analytics_solution" "main" { solution_name = "ContainerInsights" workspace_name = local.log_analytics_workspace.name workspace_resource_id = local.log_analytics_workspace.id - tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_git_commit = "886c26d95843149cc2a58ae72edb31478faa2a8c" - avm_git_file = "main.tf" - avm_git_last_modified_at = "2023-07-20 06:04:07" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "9c7b610a-6825-431f-a6b4-3a9c05309eca" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { - for k, v in /**/ { - avm_yor_name = "main" - } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v - } : {}) /**/)) + tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_git_commit = "886c26d95843149cc2a58ae72edb31478faa2a8c" + avm_git_file = "main.tf" + avm_git_last_modified_at = "2023-07-20 06:04:07" + avm_git_org = "Azure" + avm_git_repo = "terraform-azurerm-aks" + avm_yor_trace = "f18f44f4-e73f-4320-b586-6cd2c0e0be0d" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/), (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { + avm_yor_name = "main" + } /**/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /**/)) plan { product = "OMSGallery/ContainerInsights"