fix(cherry-pick): regression on creationTimestamp with server-side diff

pjiang-dev · web-flow · commit fcfcfd9ae1ef · 2025-11-08T15:23:10.000-08:00
diff --git a/pkg/diff/diff.go b/pkg/diff/diff.go
@@ -182,6 +182,9 @@ func serverSideDiff(config, live *unstructured.Unstructured, opts ...Option) (*D
 			return nil, fmt.Errorf("error removing non config mutations for resource %s/%s: %w", config.GetKind(), config.GetName(), err)
 		}
 	}
+	
+	// Remarshal predictedLive to ensure it receives the same normalization as live.
+	predictedLive = remarshal(predictedLive, o)
 
 	Normalize(predictedLive, opts...)
 	unstructured.RemoveNestedField(predictedLive.Object, "metadata", "managedFields")

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,9 @@ func serverSideDiff(config, live unstructured.Unstructured, opts ...Option) (D`
`182`	`182`	`return nil, fmt.Errorf("error removing non config mutations for resource %s/%s: %w", config.GetKind(), config.GetName(), err)`
`183`	`183`	`}`
`184`	`184`	`}`
	`185`	`+`
	`186`	`+ // Remarshal predictedLive to ensure it receives the same normalization as live.`
	`187`	`+ predictedLive = remarshal(predictedLive, o)`
`185`	`188`
`186`	`189`	`Normalize(predictedLive, opts...)`
`187`	`190`	`unstructured.RemoveNestedField(predictedLive.Object, "metadata", "managedFields")`