Skip to content

backport: Fix resource identity being dropped from state in certain cases (#37396)#37402

Merged
dbanck merged 1 commit intov1.13from
dbanck/backport/identity-state
Aug 5, 2025
Merged

backport: Fix resource identity being dropped from state in certain cases (#37396)#37402
dbanck merged 1 commit intov1.13from
dbanck/backport/identity-state

Conversation

@dbanck
Copy link
Copy Markdown
Member

@dbanck dbanck commented Aug 5, 2025

This is a manual backport of #37396, because the backport assistant keeps failing

Target Release

1.13.x

Rollback Plan

  • If a change needs to be reverted, we will roll out an update to the code within 7 days.

Changes to Security Controls

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

CHANGELOG entry

  • This change is user-facing and I added a changelog entry.
  • This change is not user-facing.

* Test case for keeping identity on destroy error

* Add identity to resource instance object on error

* Add changelog

* Test case for keeping identity on update without changes

* Add identity to resource instance object on udpate
@dbanck dbanck requested a review from a team as a code owner August 5, 2025 12:37
@dbanck dbanck merged commit 36a0fd6 into v1.13 Aug 5, 2025
8 checks passed
@dbanck dbanck deleted the dbanck/backport/identity-state branch August 5, 2025 13:05
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 5, 2025

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 Sep 5, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants