azurerm_kubernetes_cluster/azurerm_kubernetes_cluster_node_pool - prevent a plan diff when API returns an empty upgrade_settings object
#26541
+15
−42
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ues, and returns an empty interface if not - reverts a planned 4.0 change where upgrade settings block would become required, this needs to be optional because it cannot be specified for spot node pools - removes public_network_access_enabled in 4.0 since this property isn't functional
jackofallops
approved these changes
Jul 4, 2024
stephybun
added a commit
that referenced
this pull request
Jul 4, 2024
dduportal
pushed a commit
to jenkins-infra/azure
that referenced
this pull request
Jul 8, 2024
<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.110.0" to "3.111.0" in file
".terraform.lock.hcl"</p>
<details>
<summary>3.111.0</summary>
<pre>Changelog retrieved
from:
	https://github.com/hashicorp/terraform-provider-azurerm/releases/tag/v3.111.0
FEATURES:

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

ENHANCEMENTS:

*
dependencies: updating to `v0.20240701.1082110` of
`github.com/hashicorp/go-azure-sdk`
([#26502](https://github.com/hashicorp/terraform-provider-azurerm/issues/26502))
*
`azurerm_disk_encryption_set` - support for the `managed_hsm_key_id`
property
([#26201](https://github.com/hashicorp/terraform-provider-azurerm/issues/26201))
*
`azurerm_firewall_policy` - remove Computed from the `sku` property and
add a default of `Standard` in 4.0
([#26499](https://github.com/hashicorp/terraform-provider-azurerm/issues/26499))
*
`azurerm_kubernetes_cluster` - support updating
`default_node_pool.os_sku` between `Ubuntu` and `AzureLinux`
([#26262](https://github.com/hashicorp/terraform-provider-azurerm/issues/26262))
*
`azurerm_kubernetes_cluster_node_pool` - support updating `os_sku`
between `Ubuntu` and `AzureLinux`
([#26139](https://github.com/hashicorp/terraform-provider-azurerm/issues/26139))
*
`azurerm_service_plan` - support for new the Flex Consumption plan
([#26351](https://github.com/hashicorp/terraform-provider-azurerm/issues/26351))

BUG
FIXES:

* `azurerm_kubernetes_cluster` - prevent a panic
([#26478](https://github.com/hashicorp/terraform-provider-azurerm/issues/26478))
*
`azurerm_kubernetes_cluster` - prevent a diff in `upgrade_settings` when
the API returns an empty object
([#26541](https://github.com/hashicorp/terraform-provider-azurerm/issues/26541))
*
`azurerm_kubernetes_cluster_node_pool` - prevent a diff in
`upgrade_settings` when the API returns an empty object
([#26541](https://github.com/hashicorp/terraform-provider-azurerm/issues/26541))
*
`azurerm_virtual_network_gateway` - split create and update function to
fix lifecycle - ignore
([#26451](https://github.com/hashicorp/terraform-provider-azurerm/issues/26451))
*
`azurerm_virtual_network_gateway_connection` - split create and update
function to fix lifecycle - ignore
([#26431](https://github.com/hashicorp/terraform-provider-azurerm/issues/26431))


</pre>
</details>
</details>
<a
href="https://infra.ci.jenkins.io/job/updatecli/job/azure/job/main/306/">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>
Co-authored-by: Jenkins Infra Bot (updatecli) <60776566+jenkins-infra-bot@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Community Note
Description
The API returns an empty
upgrade_settingsobject in certain instances, we need to check if any values are present when flattening to prevent Terraform from showing a diff.In addition, this PR also rolls back a planned 4.0 change in the
upgrade_settingsblock, this needs to remainOptionalbecause there are scenarios where it cannot be supplied e.g. spot node pools.Also removes
public_network_access_enabledfrom the schema in 4.0 since this property still doesn't appear to be functional. Can be reintroduced at a later stage once it's working.Testing
Running ...
Change Log
Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.
azurerm_kubernetes_cluster- prevent a diff inupgrade_settingswhen the API returns an empty object [GH-00000]azurerm_kubernetes_cluster_node_pool- prevent a diff inupgrade_settingswhen the API returns an empty object [GH-00000]This is a (please select all that apply):
Related Issue(s)
Fixes #26280
Fixes #26465
Note
If this PR changes meaningfully during the course of review please update the title and description as required.