Fix backport of #4512 into release-2.2

cnmcavoy · cnmcavoy · commit b44cfd382132 · 2023-10-25T09:55:47.000-05:00
diff --git a/controllers/awsmachine_controller.go b/controllers/awsmachine_controller.go
@@ -1126,7 +1126,7 @@ func (r *AWSMachineReconciler) ensureStorageTags(ec2svc services.EC2Interface, i
 			}
 			annotations[volumeID] = newAnnotation
 		} else {
-			newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), machine.Spec.AdditionalTags)
+			newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), additionalTags)
 			if err != nil {
 				r.Log.Error(err, "Failed to fetch the changed volume tags in EC2 instance")
 			}

Original file line number	Diff line number	Diff line change
`@@ -1126,7 +1126,7 @@ func (r *AWSMachineReconciler) ensureStorageTags(ec2svc services.EC2Interface, i`
`1126`	`1126`	`}`
`1127`	`1127`	`annotations[volumeID] = newAnnotation`
`1128`	`1128`	`} else {`
`1129`		`- newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), machine.Spec.AdditionalTags)`
	`1129`	`+ newAnnotation, err := r.ensureVolumeTags(ec2svc, aws.String(volumeID), make(map[string]interface{}), additionalTags)`
`1130`	`1130`	`if err != nil {`
`1131`	`1131`	`r.Log.Error(err, "Failed to fetch the changed volume tags in EC2 instance")`
`1132`	`1132`	`}`