Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions .github/workflows/post-push.yaml

This file was deleted.

24 changes: 6 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,6 @@ No modules.
| <a name="input_support_plan"></a> [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 |
| <a name="input_tags"></a> [tags](#input\_tags) | Any tags that should be present on the AKS cluster resources | `map(string)` | `{}` | no |
| <a name="input_temporary_name_for_rotation"></a> [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 |
| <a name="input_tracing_tags_enabled"></a> [tracing\_tags\_enabled](#input\_tracing\_tags\_enabled) | Whether enable tracing tags that generated by BridgeCrew Yor. | `bool` | `false` | no |
| <a name="input_tracing_tags_prefix"></a> [tracing\_tags\_prefix](#input\_tracing\_tags\_prefix) | Default prefix for generated tracing tags | `string` | `"avm_"` | no |
| <a name="input_ultra_ssd_enabled"></a> [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 |
| <a name="input_vnet_subnet_id"></a> [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 |
| <a name="input_web_app_routing"></a> [web\_app\_routing](#input\_web\_app\_routing) | object({<br/> 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."<br/>}) | <pre>object({<br/> dns_zone_ids = list(string)<br/> })</pre> | `null` | no |
Expand Down
36 changes: 10 additions & 26 deletions extra_node_pool.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
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"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
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"]
Expand Down Expand Up @@ -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, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
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"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
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"]
Expand Down
22 changes: 2 additions & 20 deletions log_analytics.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
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"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
avm_yor_name = "main"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
tags = var.tags

dynamic "identity" {
for_each = var.log_analytics_workspace_identity == null ? [] : [var.log_analytics_workspace_identity]
Expand Down Expand Up @@ -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, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
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"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
avm_yor_name = "main"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
tags = var.tags

plan {
product = "OMSGallery/ContainerInsights"
Expand Down
13 changes: 2 additions & 11 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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, (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
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"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/), (/*<box>*/ (var.tracing_tags_enabled ? { for k, v in /*</box>*/ {
avm_yor_name = "main"
} /*<box>*/ : replace(k, "avm_", var.tracing_tags_prefix) => v } : {}) /*</box>*/))
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"]
Expand Down
16 changes: 0 additions & 16 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading