Merge pull request #15575 from hakman/automated-cherry-pick-of-#15573-upstream-release-1.26

Automated cherry pick of #15573: aws: Avoid spurious changes in EBSVolume for KmsKeyId
2023-07-02 14:56:50 -07:00 · 2023-07-02 14:56:50 -07:00 · 7d83895444
parent 165ad24b0d aafa856864
commit 7d83895444
1 changed files with 3 additions and 1 deletions
--- a/upup/pkg/fi/cloudup/awstasks/ebsvolume.go
+++ b/upup/pkg/fi/cloudup/awstasks/ebsvolume.go
@ -90,8 +90,10 @@ func (e *EBSVolume) Find(context *fi.CloudupContext) (*EBSVolume, error) {

 	// Avoid spurious changes
 	actual.Lifecycle = e.Lifecycle
-
 	e.ID = actual.ID
+	if fi.ValueOf(e.Encrypted) && e.KmsKeyId == nil {
+		e.KmsKeyId = actual.KmsKeyId
+	}

 	return actual, nil
 }