`azurerm_kubernetes_cluster` - support for the `web_app_routing.dns_zone_ids` property #26117

ms-henglu · 2024-05-28T05:32:25Z

fixes #26110

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevent documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

=== RUN   TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
=== PAUSE TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
=== CONT  TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
--- PASS: TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone (767.98s)

=== RUN   TestAccKubernetesCluster_webAppRouting
=== PAUSE TestAccKubernetesCluster_webAppRouting
=== CONT  TestAccKubernetesCluster_webAppRouting
--- PASS: TestAccKubernetesCluster_webAppRouting (1295.45s)
PASS

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_resource - support for the thing1 property [GH-00000]

This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

Fixes #0000

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

…one_ids` property

katbyte

All tests are failing:

------- Stdout: -------
=== RUN   TestAccKubernetesCluster_serviceMeshProfile
=== PAUSE TestAccKubernetesCluster_serviceMeshProfile
=== CONT  TestAccKubernetesCluster_serviceMeshProfile
    testcase.go:113: Step 3/4 error: Error running apply: exit status 1
        
        Error: updating Kubernetes Cluster (Subscription: "*******"
        Resource Group Name: "acctestRG-aks-240530033930946571"
        Kubernetes Cluster Name: "acctestaks240530033930946571"): performing CreateOrUpdate: unexpected status 400 (400 Bad Request) with response: {
          "code": "BadRequest",
          "details": null,
          "message": "Requested change in revisions is not allowed. Reason: ServiceMeshProfile revision field must not be empty.",
          "subcode": ""
         }
        
          with azurerm_kubernetes_cluster.test,
          on terraform_plugin_test.tf line 44, in resource "azurerm_kubernetes_cluster" "test":
          44: resource "azurerm_kubernetes_cluster" "test" {
        
--- FAIL: TestAccKubernetesCluster_serviceMeshProfile (1267.51s)
FAIL

ms-henglu · 2024-05-31T03:09:11Z

Hi @katbyte , this failed test is not related with this change and this test is already failing. I'll work on fixing it, but I think it won't block this PR, right?

stephybun · 2024-05-31T06:05:16Z

internal/services/containers/kubernetes_cluster_other_resource_test.go

@@ -928,7 +952,7 @@ func TestAccKubernetesCluster_webAppRoutingPrivateDNS(t *testing.T) {
 				check.That(data.ResourceName).Key("web_app_routing.0.web_app_routing_identity.#").HasValue("1"),
 			),
 		},
-		data.ImportStep(),
+		data.ImportStep("web_app_routing.0.dns_zone_id", "web_app_routing.0.dns_zone_ids.#", "web_app_routing.0.dns_zone_ids.0"),


Why do we need to add these here?

Because in this test config, this feature is specified with dns_zone_id. But in the import step, by default it will be imported as dns_zone_ids, so there're some differences between them.

This test will fail in 4.0 mode, so can we add a t.Skip for it?

@ms-henglu, this test as well as TestAccKubernetesCluster_webAppRouting will fail in 4.0 mode, can you please add the skip for these.

stephybun · 2024-06-03T05:31:32Z

website/docs/r/kubernetes_cluster.html.markdown

@@ -891,7 +891,7 @@ A `sysctl_config` block supports the following:

 A `web_app_routing` block supports the following:

-* `dns_zone_id` - (Required) Specifies the ID of the DNS Zone in which DNS entries are created for applications deployed to the cluster when Web App Routing is enabled. For Bring-Your-Own DNS zones this property should be set to an empty string `""`.
+* `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. For Bring-Your-Own DNS zones this property should be set to an empty string `""`.


For Bring-Your-Own DNS zones this property should be set to an empty string ""

Is that still valid?

I double checked with service team, and it should be an empty list now. Actually, user should set it to empty string/list if NOT using the Bring-Your-Own DNS zones feature. I've fixed it in this PR.

stephybun

Thanks @ms-henglu. Can you please also verify that the tests pass in 4.0 mode?

ms-henglu · 2024-06-05T08:54:46Z

Thanks @ms-henglu. Can you please also verify that the tests pass in 4.0 mode?

Sure. I tried, but the tests are failing in the 4.0 mode and unrelated with this change. I'll open another PR to fix them.

stephybun · 2024-06-05T09:03:53Z

@ms-henglu #26231 should resolve most of the 4.0 issues in the resource.

ms-henglu · 2024-06-06T03:14:42Z

=== RUN   TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
=== PAUSE TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
=== CONT  TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone
--- PASS: TestAccKubernetesCluster_webAppRoutingWithMultipleDnsZone (639.36s)
PASS

Thanks @stephybun , the tests are passing in 4.0 mode now.

stephybun · 2024-06-06T05:59:41Z

internal/services/containers/kubernetes_cluster_other_resource_test.go

@@ -928,7 +952,7 @@ func TestAccKubernetesCluster_webAppRoutingPrivateDNS(t *testing.T) {
 				check.That(data.ResourceName).Key("web_app_routing.0.web_app_routing_identity.#").HasValue("1"),
 			),
 		},
-		data.ImportStep(),
+		data.ImportStep("web_app_routing.0.dns_zone_id", "web_app_routing.0.dns_zone_ids.#", "web_app_routing.0.dns_zone_ids.0"),


@ms-henglu, this test as well as TestAccKubernetesCluster_webAppRouting will fail in 4.0 mode, can you please add the skip for these.

ms-henglu · 2024-06-06T06:25:50Z

Thanks @stephybun , I added the skip for those tests.

stephybun

Looks like the FourPointOhBeta flag flip was accidentally committed, can you please revert that? This should be good to go then.

stephybun · 2024-06-06T06:46:50Z

internal/features/four_point_oh.go

@@ -38,5 +38,5 @@ func FourPointOh() bool {
 // This exists to allow breaking changes to be piped through the provider
 // during the development of 3.x until 4.0 is ready.
 func FourPointOhBeta() bool {
-	return FourPointOh() || false
+	return true


We need to revert this

ms-henglu · 2024-06-06T06:49:10Z

My bad, I committed the test code by mistake. Now it's reverted.

stephybun

Thanks @ms-henglu LGTM 👍

<Actions> <action id="f410411e63aff4bb73a81c2aec1d373cf8a903e63b30dee2006b0030d8a94cc8"> <h3>Bump Terraform `azurerm` provider version</h3> <details id="1d9343c012f5434ac9fe8a98135bae3667b399259be16d9b14302ea3bd424a24"> <summary>Update Terraform lock file</summary> <p>changes detected:
	"hashicorp/azurerm" updated from "3.104.2" to "3.107.0" in file ".terraform.lock.hcl"</p> <details> <summary>3.107.0</summary> <pre>Changelog retrieved from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.107.0
FEATURES:

* **New Resource:** `azurerm_data_protection_backup_policy_postgresql_flexible_server` ([#26024](https://github.com/hashicorp/terraform-provider-azurerm/issues/26024))

ENHANCEMENTS:

* dependencies: updating to `v0.20240604.1114748` of `github.com/hashicorp/go-azure-sdk` ([#26216](hashicorp/terraform-provider-azurerm#26216 `advisor`: update API version to `2023-01-01` ([#26205](hashicorp/terraform-provider-azurerm#26205 `keyvault`: handling the Resources API returning Key Vaults that have been deleted when populating the cache ([#26199](hashicorp/terraform-provider-azurerm#26199 `machinelearning`: update API version to `2024-04-01` ([#26168](hashicorp/terraform-provider-azurerm#26168 `network/privatelinkservices` - update to use `hashicorp/go-azure-sdk` ([#26212](hashicorp/terraform-provider-azurerm#26212 `network/serviceendpointpolicies` - update to use `hashicorp/go-azure-sdk` ([#26196](hashicorp/terraform-provider-azurerm#26196 `network/virtualnetworks` - update to use `hashicorp/go-azure-sdk` ([#26217](hashicorp/terraform-provider-azurerm#26217 `network/virtualwans`: update route resources to use `hashicorp/go-azure-sdk` ([#26189](hashicorp/terraform-provider-azurerm#26189 `azurerm_container_app_job` - support for the `key_vault_secret_id` and `identity` properties in the `secret` block ([#25969](hashicorp/terraform-provider-azurerm#25969 `azurerm_kubernetes_cluster` - support forthe `dns_zone_ids` popperty in the `web_app_routing` block ([#26117](hashicorp/terraform-provider-azurerm#26117 `azurerm_notification_hub_authorization_rule` - support for the `primary_connection_string` and `secondary_connection_string` properties ([#26188](hashicorp/terraform-provider-azurerm#26188 `azurerm_subnet` - support for the `default_outbound_access_enabled` property ([#25259](https://github.com/hashicorp/terraform-provider-azurerm/issues/25259))

BUG FIXES:

* `azurerm_api_management_named_value` - will now enforce setting the `secret` property when setting the `value_from_key_vault` property ([#26150](hashicorp/terraform-provider-azurerm#26150 `azurerm_storage_sync_server_endpoint` - improve pooling to work around api inconsistencies ([#26204](hashicorp/terraform-provider-azurerm#26204 `azurerm_virtual_network` - split create and update function to fix lifecycle - ignore ([#26246](hashicorp/terraform-provider-azurerm#26246 `azurerm_vpn_server_configuration` - split create and update function to fix lifecycle - ignore ([#26175](hashicorp/terraform-provider-azurerm#26175 `azurerm_vpn_server_configuration_policy_group` - split create and update function to fix lifecycle - ignore ([#26207](hashicorp/terraform-provider-azurerm#26207 `azurerm_vpn_site` - split create and update function to fix lifecycle - ignore changes ([#26163](https://github.com/hashicorp/terraform-provider-azurerm/issues/26163))

DEPRECATIONS:

* `azurerm_kubernetes_cluster` - the property `dns_zone_id` has been superseded by the property `dns_zone_ids` in the `web_app_routing` block ([#26117](hashicorp/terraform-provider-azurerm#26117 `azurerm_nginx_deployment` - the block `configuration` has been deprecated and superseded by the resource `azurerm_nginx_configuration` ([#25773](https://github.com/hashicorp/terraform-provider-azurerm/issues/25773))


</pre> </details> </details> <a href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/229/">Jenkins pipeline link</a> </action> </Actions> --- <table> <tr> <td width="77"> <img src="https://www.updatecli.io/images/updatecli.png" alt="Updatecli logo" width="50" height="50"> </td> <td> <p> Created automatically by <a href="https://www.updatecli.io/">Updatecli</a> </p> <details><summary>Options:</summary> <br /> <p>Most of Updatecli configuration is done via <a href="https://www.updatecli.io/docs/prologue/quick-start/">its manifest(s)</a>.</p> <ul> <li>If you close this pull request, Updatecli will automatically reopen it, the next time it runs.</li> <li>If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.</li> </ul> <p> Feel free to report any issues at <a href="https://github.com/updatecli/updatecli/issues">github.com/updatecli/updatecli</a>.<br /> If you find this tool useful, do not hesitate to star <a href="https://github.com/updatecli/updatecli/stargazers">our GitHub repository</a> as a sign of appreciation, and/or to tell us directly on our <a href="https://matrix.to/#/#Updatecli_community:gitter.im">chat</a>! </p> </details> </td> </tr> </table> --------- Signed-off-by: Damien Duportal <[email protected]> Co-authored-by: Jenkins Infra Bot (updatecli) <[email protected]> Co-authored-by: Damien Duportal <[email protected]>

github-actions · 2024-07-07T02:11:13Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

azurerm_kubernetes_cluster - support for the `web_app_routing.dns_z…

24600a3

…one_ids` property

github-actions bot added documentation size/L labels May 28, 2024

ms-henglu marked this pull request as ready for review May 28, 2024 05:33

update ignores in the import step

e05cba3

katbyte requested changes May 31, 2024

View reviewed changes

github-actions bot added the waiting-response label May 31, 2024

github-actions bot removed the waiting-response label May 31, 2024

stephybun reviewed Jun 3, 2024

View reviewed changes

github-actions bot added the waiting-response label Jun 3, 2024

update doc description

af50e1f

github-actions bot removed the waiting-response label Jun 5, 2024

ms-henglu requested a review from stephybun June 5, 2024 01:28

github-actions bot added the waiting-response label Jun 5, 2024

stephybun requested changes Jun 5, 2024

View reviewed changes

github-actions bot removed the waiting-response label Jun 5, 2024

Merge branch 'main' into issue-26110

7be2c86

stephybun requested changes Jun 6, 2024

View reviewed changes

github-actions bot added the waiting-response label Jun 6, 2024

skip tests in 4.0

e89daf1

github-actions bot removed the waiting-response label Jun 6, 2024

github-actions bot added the waiting-response label Jun 6, 2024

stephybun requested changes Jun 6, 2024

View reviewed changes

revert test code

8c30ea4

github-actions bot removed the waiting-response label Jun 6, 2024

stephybun added enhancement service/kubernetes-cluster labels Jun 6, 2024

stephybun approved these changes Jun 6, 2024

View reviewed changes

stephybun merged commit 147b7b7 into hashicorp:main Jun 6, 2024
33 checks passed

github-actions bot added this to the v3.107.0 milestone Jun 6, 2024

stephybun added a commit that referenced this pull request Jun 6, 2024

Update for #25773 #26117 #26212 #26217 #26196 #26189

6c924c5

stephybun mentioned this pull request Jun 13, 2024

Support for Multiple Azure DNS zone in App Routing add-on #23801

Closed

1 task

github-actions bot locked as resolved and limited conversation to collaborators Jul 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_kubernetes_cluster` - support for the `web_app_routing.dns_zone_ids` property #26117

`azurerm_kubernetes_cluster` - support for the `web_app_routing.dns_zone_ids` property #26117

ms-henglu commented May 28, 2024 •

edited

Loading

katbyte left a comment

ms-henglu commented May 31, 2024

stephybun May 31, 2024

ms-henglu Jun 5, 2024

stephybun Jun 5, 2024

stephybun Jun 6, 2024

stephybun Jun 3, 2024

ms-henglu Jun 5, 2024

stephybun left a comment

ms-henglu commented Jun 5, 2024

stephybun commented Jun 5, 2024

ms-henglu commented Jun 6, 2024

stephybun Jun 6, 2024

ms-henglu commented Jun 6, 2024

stephybun left a comment

stephybun Jun 6, 2024

ms-henglu commented Jun 6, 2024

stephybun left a comment

github-actions bot commented Jul 7, 2024

azurerm_kubernetes_cluster - support for the web_app_routing.dns_zone_ids property #26117

azurerm_kubernetes_cluster - support for the web_app_routing.dns_zone_ids property #26117

Conversation

ms-henglu commented May 28, 2024 • edited Loading

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

katbyte left a comment

Choose a reason for hiding this comment

ms-henglu commented May 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

ms-henglu commented Jun 5, 2024

stephybun commented Jun 5, 2024

ms-henglu commented Jun 6, 2024

Choose a reason for hiding this comment

ms-henglu commented Jun 6, 2024

stephybun left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ms-henglu commented Jun 6, 2024

stephybun left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 7, 2024

`azurerm_kubernetes_cluster` - support for the `web_app_routing.dns_zone_ids` property #26117

`azurerm_kubernetes_cluster` - support for the `web_app_routing.dns_zone_ids` property #26117

ms-henglu commented May 28, 2024 •

edited

Loading