-
Notifications
You must be signed in to change notification settings - Fork 914
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix deep equal check failure on objects with runtime.RawExtension. #5940
base: master
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
/* | ||
Copyright 2024 The Karmada Authors. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package util | ||
|
||
import ( | ||
"encoding/json" | ||
|
||
"k8s.io/apimachinery/pkg/conversion" | ||
"k8s.io/apimachinery/pkg/runtime" | ||
|
||
workv1alpha1 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha1" | ||
workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2" | ||
) | ||
|
||
// RegisterEqualityCheckFunctions registers custom check functions to the equality checker. | ||
// These functions help avoid performing deep-equality checks on workloads represented as byte slices. | ||
func RegisterEqualityCheckFunctions(e *conversion.Equalities) error { | ||
return e.AddFuncs( | ||
func(a, b workv1alpha1.Manifest) bool { | ||
return rawExtensionDeepEqual(&a.RawExtension, &b.RawExtension, e) | ||
}, | ||
func(a, b workv1alpha1.ManifestStatus) bool { | ||
return e.DeepEqual(a.Identifier, b.Identifier) && | ||
rawExtensionDeepEqual(a.Status, b.Status, e) && | ||
e.DeepEqual(a.Health, b.Health) | ||
}, | ||
func(a, b workv1alpha1.AggregatedStatusItem) bool { | ||
return e.DeepEqual(a.ClusterName, b.ClusterName) && | ||
rawExtensionDeepEqual(a.Status, b.Status, e) && | ||
e.DeepEqual(a.Applied, b.Applied) && | ||
e.DeepEqual(a.AppliedMessage, b.AppliedMessage) | ||
}, | ||
func(a, b workv1alpha2.AggregatedStatusItem) bool { | ||
return e.DeepEqual(a.ClusterName, b.ClusterName) && | ||
rawExtensionDeepEqual(a.Status, b.Status, e) && | ||
e.DeepEqual(a.Applied, b.Applied) && | ||
e.DeepEqual(a.AppliedMessage, b.AppliedMessage) | ||
}, | ||
) | ||
} | ||
|
||
func rawExtensionDeepEqual(a, b *runtime.RawExtension, checker *conversion.Equalities) bool { | ||
if a == nil && b == nil { | ||
return true | ||
} | ||
if a == nil || b == nil { | ||
return false | ||
} | ||
aObj, errA := parseRawExtension(*a) | ||
bObj, errB := parseRawExtension(*b) | ||
if errA != nil && errB != nil { | ||
return checker.DeepEqual(a, b) // fallback to directly compare the object | ||
} | ||
if errA != nil || errB != nil { | ||
return false | ||
} | ||
return checker.DeepEqual(aObj, bObj) | ||
} | ||
|
||
func parseRawExtension(e runtime.RawExtension) (map[string]any, error) { | ||
j, err := json.Marshal(e) | ||
if err != nil { | ||
return nil, err | ||
} | ||
if string(j) == "null" { | ||
return nil, nil | ||
} | ||
|
||
obj := make(map[string]any) | ||
err = json.Unmarshal(j, &obj) | ||
Comment on lines
+75
to
+84
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you remind me why not just Unmarshal There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. One of the reasons is that I think we should not limit |
||
if err != nil { | ||
return nil, err | ||
} | ||
return obj, nil | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One question, can we just add a comparison function for
runtime.RawExtension
:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then if other parts (not even karmada code) also use deepEqual on
runtime.RawExtension
, they will also be affected by the new check functions, I think the impact will be larger and more unpredictable.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for explaining!