github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

[apimachinery] Remove map nil check before delete in mergeMap

Browse Source 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
This commit is contained in:
Gaurav Singh 2020-06-25 12:08:52 -04:00
parent 3c31a0026a
commit 5e0b20fcd6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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
} }