mirror of
https://github.com/outbackdingo/kubernetes.git
synced 2026-02-17 16:30:37 +00:00
778da50811
Automatic merge from submit-queue (batch tested with PRs 49259, 49350) update json-patch to fix nil value issue when creating mergepatch **What this PR does / why we need it**: When [creating a patch for merge](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubectl/cmd/annotate.go#L255), nil value will be considered as different value. This has been fixed and merged in [evanphx/json-patch #45](https://github.com/evanphx/json-patch/pull/45). **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49044 **Special notes for your reviewer**: /cc @MikeSpreitzer @mengqiy **Release note**: ```release-note Fix nil value issue when creating json patch for merge ```