Update dependency go modules for k8s v1.29.0-rc.1
This commit is contained in:
2
vendor/sigs.k8s.io/structured-merge-diff/v4/merge/conflict.go
generated
vendored
2
vendor/sigs.k8s.io/structured-merge-diff/v4/merge/conflict.go
generated
vendored
@@ -112,7 +112,7 @@ func ConflictsFromManagers(sets fieldpath.ManagedFields) Conflicts {
|
||||
set.Set().Iterate(func(p fieldpath.Path) {
|
||||
conflicts = append(conflicts, Conflict{
|
||||
Manager: manager,
|
||||
Path: p,
|
||||
Path: p.Copy(),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user