diff --git a/.github/workflows/post-push.yaml b/.github/workflows/post-push.yaml deleted file mode 100644 index 171e3ade..00000000 --- a/.github/workflows/post-push.yaml +++ /dev/null @@ -1,15 +0,0 @@ -name: Post Push -on: - push: - branches: - - main - - master - tags: - - '*' - -permissions: write-all - -jobs: - post-push: - if: github.actor != 'github-actions[bot]' - uses: Azure/tfmod-scaffold/.github/workflows/post-push.yaml@main \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index a48da052..57a75b39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,11 @@ # Changelog -## [Unreleased](https://github.com/Azure/terraform-azurerm-aks/tree/HEAD) +## Important Notice -**Merged pull requests:** +**This CHANGELOG.md file is no longer updated or maintained.** -- implement all node\_network\_profile features [\#648](https://github.com/Azure/terraform-azurerm-aks/pull/648) ([lonegunmanb](https://github.com/lonegunmanb)) -- Bump github.com/Azure/terraform-module-test-helper in /test [\#647](https://github.com/Azure/terraform-azurerm-aks/pull/647) ([lonegunmanb](https://github.com/lonegunmanb)) -- resource\_group: remove data source + location required [\#644](https://github.com/Azure/terraform-azurerm-aks/pull/644) ([lonegunmanb](https://github.com/lonegunmanb)) -- "Improve automatic\_channel\_upgrade description for clarity and completeness" [\#641](https://github.com/Azure/terraform-azurerm-aks/pull/641) ([Vinaum8](https://github.com/Vinaum8)) -- Add temporary\_name\_for\_rotation in azurerm\_kubernetes\_cluster\_node\_pool [\#638](https://github.com/Azure/terraform-azurerm-aks/pull/638) ([zioproto](https://github.com/zioproto)) -- Release `v10.0.0` [\#636](https://github.com/Azure/terraform-azurerm-aks/pull/636) ([lonegunmanb](https://github.com/lonegunmanb)) -- Add nonsensitive around for\_each argument [\#631](https://github.com/Azure/terraform-azurerm-aks/pull/631) ([zioproto](https://github.com/zioproto)) -- Implement Data Collection Rule for Container Insights [\#623](https://github.com/Azure/terraform-azurerm-aks/pull/623) ([zioproto](https://github.com/zioproto)) -- Cannot set both `client_id` and `identity_ids` variables. [\#622](https://github.com/Azure/terraform-azurerm-aks/pull/622) ([zioproto](https://github.com/zioproto)) -- support the dns\_zone\_ids property in the web\_app\_routing block [\#606](https://github.com/Azure/terraform-azurerm-aks/pull/606) ([zioproto](https://github.com/zioproto)) -- resource\_group: remove data source + location required [\#603](https://github.com/Azure/terraform-azurerm-aks/pull/603) ([DeviaVir](https://github.com/DeviaVir)) -- Amend new attributes in network\_profile block [\#585](https://github.com/Azure/terraform-azurerm-aks/pull/585) ([lonegunmanb](https://github.com/lonegunmanb)) -- Add `var.dns_prefix_private_cluster` [\#584](https://github.com/Azure/terraform-azurerm-aks/pull/584) ([lonegunmanb](https://github.com/lonegunmanb)) +For the most up-to-date information about changes and updates, please refer to the +[Release Notes](https://github.com/Azure/terraform-azurerm-aks/releases) on our GitHub releases page. - - -\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)* +The release notes contain detailed information about new features, improvements, +bug fixes. diff --git a/README.md b/README.md index cde9c4d3..c995535c 100644 --- a/README.md +++ b/README.md @@ -434,8 +434,6 @@ No modules. | [support\_plan](#input\_support\_plan) | The support plan which should be used for this Kubernetes Cluster. Possible values are `KubernetesOfficial` and `AKSLongTermSupport`. | `string` | `"KubernetesOfficial"` | no | | [tags](#input\_tags) | Any tags that should be present on the AKS cluster resources | `map(string)` | `{}` | no | | [temporary\_name\_for\_rotation](#input\_temporary\_name\_for\_rotation) | (Optional) Specifies the name of the temporary node pool used to cycle the default node pool for VM resizing. the `var.agents_size` is no longer ForceNew and can be resized by specifying `temporary_name_for_rotation` | `string` | `null` | no | -| [tracing\_tags\_enabled](#input\_tracing\_tags\_enabled) | Whether enable tracing tags that generated by BridgeCrew Yor. | `bool` | `false` | no | -| [tracing\_tags\_prefix](#input\_tracing\_tags\_prefix) | Default prefix for generated tracing tags | `string` | `"avm_"` | no | | [ultra\_ssd\_enabled](#input\_ultra\_ssd\_enabled) | (Optional) Used to specify whether the UltraSSD is enabled in the Default Node Pool. Defaults to false. | `bool` | `false` | no | | [vnet\_subnet\_id](#input\_vnet\_subnet\_id) | (Optional) The ID of a Subnet where the Kubernetes Node Pool should exist. Changing this forces a new resource to be created. | `string` | `null` | no | | [web\_app\_routing](#input\_web\_app\_routing) | object({
dns\_zone\_ids = "(Required) Specifies the list of the DNS Zone IDs in which DNS entries are created for applications deployed to the cluster when Web App Routing is enabled. If not using Bring-Your-Own DNS zones this property should be set to an empty list."
}) |
object({
dns_zone_ids = list(string)
})
| `null` | no | diff --git a/extra_node_pool.tf b/extra_node_pool.tf index 8ec6b231..5779b603 100644 --- a/extra_node_pool.tf +++ b/extra_node_pool.tf @@ -34,19 +34,11 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_before_destroy 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_yor_name = "node_pool_create_before_destroy" - avm_git_commit = "5c71566abb93bfb7a6bf09b3a0fecea8a329c01e" - avm_git_file = "extra_node_pool.tf" - avm_git_last_modified_at = "2024-06-11 12:44:16" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "cd0a4528-6aa3-4dc9-a1bf-c09590f0f4c6" - } /**/ : 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 - zones = each.value.zones + tags = each.value.tags + ultra_ssd_enabled = each.value.ultra_ssd_enabled + vnet_subnet_id = each.value.vnet_subnet_id + workload_runtime = each.value.workload_runtime + zones = each.value.zones dynamic "kubelet_config" { for_each = each.value.kubelet_config == null ? [] : ["kubelet_config"] @@ -200,19 +192,11 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_after_destroy" 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_yor_name = "node_pool_create_after_destroy" - avm_git_commit = "5c71566abb93bfb7a6bf09b3a0fecea8a329c01e" - avm_git_file = "extra_node_pool.tf" - avm_git_last_modified_at = "2024-06-11 12:44:16" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "691100f5-bff3-41a1-aecb-51e4d18bc56a" - } /**/ : 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 - zones = each.value.zones + tags = each.value.tags + ultra_ssd_enabled = each.value.ultra_ssd_enabled + vnet_subnet_id = each.value.vnet_subnet_id + workload_runtime = each.value.workload_runtime + zones = each.value.zones dynamic "kubelet_config" { for_each = each.value.kubelet_config == null ? [] : ["kubelet_config"] diff --git a/log_analytics.tf b/log_analytics.tf index 3535ac38..b76cd366 100644 --- a/log_analytics.tf +++ b/log_analytics.tf @@ -15,16 +15,7 @@ resource "azurerm_log_analytics_workspace" "main" { reservation_capacity_in_gb_per_day = var.log_analytics_workspace_reservation_capacity_in_gb_per_day 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 = "e3dd48ea03e7fd9955145d5e1b985fb501c49d91" - avm_git_file = "log_analytics.tf" - avm_git_last_modified_at = "2024-05-20 06:53:31" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "f58cfe56-cff2-4552-8bf7-07e998fa28f3" - } /**/ : 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 = var.tags dynamic "identity" { for_each = var.log_analytics_workspace_identity == null ? [] : [var.log_analytics_workspace_identity] @@ -65,16 +56,7 @@ 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 = "5bcf0000-2dc6-441a-9825-6d582659aeb7" - } /**/ : 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 = var.tags plan { product = "OMSGallery/ContainerInsights" diff --git a/main.tf b/main.tf index bf414c53..d61473c8 100644 --- a/main.tf +++ b/main.tf @@ -33,17 +33,8 @@ resource "azurerm_kubernetes_cluster" "main" { run_command_enabled = var.run_command_enabled sku_tier = var.sku_tier support_plan = var.support_plan - tags = merge(var.tags, (/**/ (var.tracing_tags_enabled ? { for k, v in /**/ { - avm_git_commit = "a2b7e7dc8b41c0c8c0e5e2ab7902b46bc2d6919e" - avm_git_file = "main.tf" - avm_git_last_modified_at = "2024-02-16 15:45:22" - avm_git_org = "Azure" - avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "cd7d230c-94c5-4b6c-88c8-af7b36a10f7d" - } /**/ : 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 + tags = var.tags + workload_identity_enabled = var.workload_identity_enabled dynamic "default_node_pool" { for_each = var.enable_auto_scaling == true ? [] : ["default_node_pool_manually_scaled"] diff --git a/variables.tf b/variables.tf index cc4ea104..d56ebea1 100644 --- a/variables.tf +++ b/variables.tf @@ -1536,22 +1536,6 @@ variable "temporary_name_for_rotation" { description = "(Optional) Specifies the name of the temporary node pool used to cycle the default node pool for VM resizing. the `var.agents_size` is no longer ForceNew and can be resized by specifying `temporary_name_for_rotation`" } -# tflint-ignore: terraform_unused_declarations -variable "tracing_tags_enabled" { - type = bool - default = false - description = "Whether enable tracing tags that generated by BridgeCrew Yor." - nullable = false -} - -# tflint-ignore: terraform_unused_declarations -variable "tracing_tags_prefix" { - type = string - default = "avm_" - description = "Default prefix for generated tracing tags" - nullable = false -} - variable "ultra_ssd_enabled" { type = bool default = false