fix MAPI MachineSet providerSpec diff

Author: chrischdi

pkg/controllers/machinesetsync/machineset_sync_controller.go

@@ -1382,7 +1382,7 @@ func compareCAPIMachineSets(capiMachineSet1, capiMachineSet2 *clusterv1.MachineS
 // compareMAPIMachineSets compares MAPI machineSets a and b, and returns a list of differences, or none if there are none.
 func compareMAPIMachineSets(platform configv1.PlatformType, a, b *mapiv1beta1.MachineSet) (util.DiffResult, error) {
 	diff, err := util.NewDefaultDiffer(
-		util.WithProviderSpec(platform, []string{"spec", "template", "providerSpec", "value"}, mapi2capi.ProviderSpecFromRawExtension),
+		util.WithProviderSpec(platform, []string{"spec", "template", "spec", "providerSpec", "value"}, mapi2capi.ProviderSpecFromRawExtension),
 
 		// Other status fields to ignore
 		util.WithIgnoreField("status", "replicas"),

pkg/util/diff.go

@@ -294,9 +294,7 @@ func WithProviderSpec(platform configv1.PlatformType, path []string, marshalProv
 			// unset the nested field
 			unstructured.RemoveNestedField(obj, path...)
 			// add it as top-level field
-			if err := unstructured.SetNestedField(obj, providerSpec, d.providerSpecPath); err != nil {
-				return fmt.Errorf("failed to set nested field %s: %w", d.providerSpecPath, err)
-			}
+			obj[d.providerSpecPath] = providerSpec
 
 			return nil
 		}