Skip to content

support for the virtual_network_integration_enabled and subnet_id properties#30559

Merged
sreallymatt merged 6 commits intohashicorp:mainfrom
ms-henglu:branch-250820-aks-vnet-integration
Sep 24, 2025
Merged

support for the virtual_network_integration_enabled and subnet_id properties#30559
sreallymatt merged 6 commits intohashicorp:mainfrom
ms-henglu:branch-250820-aks-vnet-integration

Conversation

@ms-henglu
Copy link
Collaborator

@ms-henglu ms-henglu commented Sep 5, 2025

This PR adds back features that are reverted by #30551.

It's based on #30516

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 comments along the lines of "+1", "me too" or "any updates", 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 relevant 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

  • 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

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the provider.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Note

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

@ms-henglu
Copy link
Collaborator Author

Tests:
image

@ms-henglu ms-henglu marked this pull request as ready for review September 8, 2025 01:37
@ms-henglu ms-henglu requested review from a team, WodansSon and magodo as code owners September 8, 2025 01:37
Copy link
Collaborator

@sreallymatt sreallymatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @ms-henglu, I've left a question regarding the implementation of these new properties if you wouldn't mind confirming

ValidateFunc: validate.CIDR,
},
},
"vnet_integration_enabled": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Following the naming guide I think we should avoid abbreviating virtual_network to vnet

Suggested change
"vnet_integration_enabled": {
"virtual_network_integration_enabled": {

@magodo magodo removed their assignment Sep 8, 2025
@github-actions github-actions bot added size/L and removed size/M labels Sep 10, 2025
@ms-henglu
Copy link
Collaborator Author

Hi @sreallymatt , thanks for the code review! I've applied the suggestion and add a test case for the managed vnet.

=== RUN   TestAccKubernetesCluster_apiServerVnetIntegrationManagedVnet
=== PAUSE TestAccKubernetesCluster_apiServerVnetIntegrationManagedVnet
=== CONT  TestAccKubernetesCluster_apiServerVnetIntegrationManagedVnet
--- PASS: TestAccKubernetesCluster_apiServerVnetIntegrationManagedVnet (636.82s)
PASS

Copy link
Collaborator

@sreallymatt sreallymatt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making those changes @ms-henglu, LGTM ✅

@sreallymatt sreallymatt changed the title support for the vnet_integration_enabled and subnet_id properties support for the virtual_network_integration_enabled and subnet_id properties Sep 24, 2025
@sreallymatt sreallymatt merged commit 3c540a2 into hashicorp:main Sep 24, 2025
35 checks passed
@c3-davidtran
Copy link

c3-davidtran commented Sep 29, 2025

@sreallymatt Provider v4 was meant to remove those flags to avoid using preview features.
While your change does allow us to configure properties vnet_integration_enabled and subnet_id, the azure Go SDK version still references preview API.

When using the 4.46.0 provider version, here is what I get :

│ Kubernetes Cluster Name: "cluster-aks"): performing CreateOrUpdate: unexpected status 400 (400 Bad Request) with response: {
│   "code": "BadRequest",
│   "details": null,
│   "message": "Feature Microsoft.ContainerService/EnableAPIServerVnetIntegrationPreview is not enabled. Please see https://aka.ms/aks/previews for how to enable features.",
│   "subcode": ""
│  }

Could a fix be provided to fix this behavior?

@github-actions
Copy link
Contributor

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 30, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants