mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-02-01 06:42:11 +00:00
43fec5afb5
Automatic merge from submit-queue (batch tested with PRs 41709, 41685, 41754, 41759, 37237) Tolerate unknown fields in strategic merge patch When using `apply` or `edit` with an object that has a compiled-in struct, if an unknown server-side field is sent, or is present in a provided file, the strategic merge patch computation fails looking up type info from the go struct If the field only exists in one side of the patch (is being added or removed), or is identical in both sides of the patch, we should tolerate missing type info, since it doesn't affect the patch.