File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -75,18 +75,22 @@ func GetNoopNormalizer() Normalizer {
75
75
// "kubectl.kubernetes.io/last-applied-configuration", then perform a three way diff.
76
76
func Diff (config , live * unstructured.Unstructured , opts ... Option ) (* DiffResult , error ) {
77
77
o := applyOptions (opts )
78
-
78
+ // Skip normalization for server-side diff as it is handled after server-side diff is calculated.
79
79
if config != nil {
80
80
config = remarshal (config , o )
81
- Normalize (config , opts ... )
81
+ if ! o .serverSideDiff {
82
+ Normalize (config , opts ... )
83
+ }
82
84
}
83
85
if live != nil {
84
86
live = remarshal (live , o )
85
- Normalize (live , opts ... )
87
+ if ! o .serverSideDiff {
88
+ Normalize (live , opts ... )
89
+ }
86
90
}
87
91
88
92
if o .serverSideDiff {
89
- r , err := serverSideDiff (config , live , opts ... )
93
+ r , err := ServerSideDiff (config , live , opts ... )
90
94
if err != nil {
91
95
return nil , fmt .Errorf ("error calculating server side diff: %w" , err )
92
96
}
You can’t perform that action at this time.
0 commit comments