Skip to content

Commit c229d82

Browse files
committed
skip pre-normalization for ssd
Signed-off-by: Peter Jiang <[email protected]>
1 parent 89f7ba7 commit c229d82

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

pkg/diff/diff.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,18 +75,22 @@ func GetNoopNormalizer() Normalizer {
7575
// "kubectl.kubernetes.io/last-applied-configuration", then perform a three way diff.
7676
func Diff(config, live *unstructured.Unstructured, opts ...Option) (*DiffResult, error) {
7777
o := applyOptions(opts)
78-
78+
// Skip normalization for server-side diff as it is handled after server-side diff is calculated.
7979
if config != nil {
8080
config = remarshal(config, o)
81-
Normalize(config, opts...)
81+
if !o.serverSideDiff {
82+
Normalize(config, opts...)
83+
}
8284
}
8385
if live != nil {
8486
live = remarshal(live, o)
85-
Normalize(live, opts...)
87+
if !o.serverSideDiff {
88+
Normalize(live, opts...)
89+
}
8690
}
8791

8892
if o.serverSideDiff {
89-
r, err := serverSideDiff(config, live, opts...)
93+
r, err := ServerSideDiff(config, live, opts...)
9094
if err != nil {
9195
return nil, fmt.Errorf("error calculating server side diff: %w", err)
9296
}

0 commit comments

Comments
 (0)