From 67ee2943f1a4144c54c7a09b64ddc9d22a41d86e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 11 Aug 2023 08:28:02 +0000 Subject: [PATCH] Auto update --- CHANGELOG.md | 6 ++++++ examples/multiple_node_pools/TestRecord.md | 20 ++++++++++++++++++++ examples/named_cluster/TestRecord.md | 21 +++++++++++++++++++++ examples/startup/TestRecord.md | 21 +++++++++++++++++++++ examples/with_acr/TestRecord.md | 20 ++++++++++++++++++++ examples/without_monitor/TestRecord.md | 21 +++++++++++++++++++++ main.tf | 22 +++++++++++----------- 7 files changed, 120 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cb92a95..8d6498f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased](https://github.com/Azure/terraform-azurerm-aks/tree/HEAD) + +**Merged pull requests:** + +- Add confidential computing in aks module [\#423](https://github.com/Azure/terraform-azurerm-aks/pull/423) ([jiaweitao001](https://github.com/jiaweitao001)) + ## [7.3.1](https://github.com/Azure/terraform-azurerm-aks/tree/7.3.1) (2023-08-10) **Merged pull requests:** diff --git a/examples/multiple_node_pools/TestRecord.md b/examples/multiple_node_pools/TestRecord.md index c0b12a54..09b41d5d 100644 --- a/examples/multiple_node_pools/TestRecord.md +++ b/examples/multiple_node_pools/TestRecord.md @@ -1,3 +1,23 @@ +## 11 Aug 23 06:14 UTC + +Success: true + +### Versions + +Terraform v1.5.2 +on linux_amd64 ++ provider registry.terraform.io/azure/azapi v1.8.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.69.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 + + + +--- + ## 09 Aug 23 06:16 UTC Success: true diff --git a/examples/named_cluster/TestRecord.md b/examples/named_cluster/TestRecord.md index 0d254a40..36c1fe2d 100644 --- a/examples/named_cluster/TestRecord.md +++ b/examples/named_cluster/TestRecord.md @@ -1,3 +1,24 @@ +## 11 Aug 23 07:04 UTC + +Success: true + +### Versions + +Terraform v1.5.2 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.8.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.69.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 + + + +--- + ## 09 Aug 23 06:49 UTC Success: true diff --git a/examples/startup/TestRecord.md b/examples/startup/TestRecord.md index 123f1fc4..f02339bd 100644 --- a/examples/startup/TestRecord.md +++ b/examples/startup/TestRecord.md @@ -1,3 +1,24 @@ +## 11 Aug 23 06:37 UTC + +Success: true + +### Versions + +Terraform v1.5.2 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.8.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.69.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 + + + +--- + ## 09 Aug 23 06:20 UTC Success: false diff --git a/examples/with_acr/TestRecord.md b/examples/with_acr/TestRecord.md index 07e8b8c8..a3526dad 100644 --- a/examples/with_acr/TestRecord.md +++ b/examples/with_acr/TestRecord.md @@ -1,3 +1,23 @@ +## 11 Aug 23 06:12 UTC + +Success: true + +### Versions + +Terraform v1.5.2 +on linux_amd64 ++ provider registry.terraform.io/azure/azapi v1.8.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.69.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 + + + +--- + ## 09 Aug 23 06:04 UTC Success: false diff --git a/examples/without_monitor/TestRecord.md b/examples/without_monitor/TestRecord.md index c8550ed5..c0a381d8 100644 --- a/examples/without_monitor/TestRecord.md +++ b/examples/without_monitor/TestRecord.md @@ -1,3 +1,24 @@ +## 11 Aug 23 07:01 UTC + +Success: true + +### Versions + +Terraform v1.5.2 +on linux_amd64 ++ provider registry.terraform.io/anschoewe/curl v1.0.2 ++ provider registry.terraform.io/azure/azapi v1.8.0 ++ provider registry.terraform.io/hashicorp/azurerm v3.69.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 + + + +--- + ## 09 Aug 23 07:05 UTC Success: true diff --git a/main.tf b/main.tf index e6313341..81d69d8a 100644 --- a/main.tf +++ b/main.tf @@ -40,19 +40,12 @@ resource "azurerm_kubernetes_cluster" "main" { avm_git_last_modified_at = "2023-06-05 02:21:33" avm_git_org = "Azure" avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "c9616397-da59-4c03-8092-a6231fe939e0" + avm_yor_trace = "f57d8afc-c056-4a38-b8bc-5ac303fb5737" } /**/ : 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 "confidential_computing" { - for_each = var.confidential_computing == null ? [] : [var.confidential_computing] - - content { - sgx_quote_helper_enabled = confidential_computing.value.sgx_quote_helper_enabled - } - } dynamic "default_node_pool" { for_each = var.enable_auto_scaling == true ? [] : ["default_node_pool_manually_scaled"] @@ -311,6 +304,13 @@ resource "azurerm_kubernetes_cluster" "main" { tenant_id = var.rbac_aad_tenant_id } } + dynamic "confidential_computing" { + for_each = var.confidential_computing == null ? [] : [var.confidential_computing] + + content { + sgx_quote_helper_enabled = confidential_computing.value.sgx_quote_helper_enabled + } + } dynamic "identity" { for_each = var.client_id == "" || var.client_secret == "" ? ["identity"] : [] @@ -567,7 +567,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" { avm_git_last_modified_at = "2023-05-04 05:02:32" avm_git_org = "Azure" avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "f9d057fe-f4be-4aa4-a2dc-49139d9d6f29" + avm_yor_trace = "7634d95e-39c1-4a9a-b2e3-1fc7d6602313" } /**/ : 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 } : {}) /**/)) @@ -711,7 +711,7 @@ resource "azurerm_log_analytics_workspace" "main" { avm_git_last_modified_at = "2023-06-05 02:21:33" avm_git_org = "Azure" avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "b9e0f94b-7145-4722-8fc2-2e6d3eaec770" + avm_yor_trace = "9bb3ab45-1155-4bea-bc68-6b7d9aa73fbc" } /**/ : 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 } : {}) /**/)) @@ -752,7 +752,7 @@ resource "azurerm_log_analytics_solution" "main" { avm_git_last_modified_at = "2023-07-20 06:04:07" avm_git_org = "Azure" avm_git_repo = "terraform-azurerm-aks" - avm_yor_trace = "656c7a0c-b1f6-48d8-9652-54cbf07010f5" + avm_yor_trace = "72af332c-2eac-4d8e-b895-bf85e31f0e23" } /**/ : 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 } : {}) /**/))