github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92517 from gaurav1086/mergeMap_remove_map_nil_check

Browse Source 
[apimachinery] Remove map nil check before delete in mergeMap
This commit is contained in:
Kubernetes Prow Robot 2020-07-01 00:07:36 -07:00 committed by GitHub
commit 7af930f2b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch.go
View File

@ -1321,9 +1321,7 @@ func mergeMap(original, patch map[string]interface{}, schema LookupPatchMeta, me
// Preserving the null value is useful when we want to send an explicit // Preserving the null value is useful when we want to send an explicit
// delete to the API server. // delete to the API server.
if patchV == nil { if patchV == nil {
if _, ok := original[k]; ok {
delete(original, k) delete(original, k)
}
if mergeOptions.IgnoreUnmatchedNulls { if mergeOptions.IgnoreUnmatchedNulls {
continue continue
} }