github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105135 from astraw99/fix-nil-mergeMap

Browse Source 
Fix nil check in map merge
This commit is contained in:
Kubernetes Prow Robot
2021-11-12 02:26:27 -08:00
committed by GitHub
parent c98b388a84 9fe2c30609
commit 7b9f4f18fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/csi/csi_mounter.go
View File

@@ -475,7 +475,7 @@ func makeVolumeHandle(podUID, volSourceSpecName string) string {
} }
func mergeMap(first, second map[string]string) map[string]string { func mergeMap(first, second map[string]string) map[string]string {
if first == nil && second != nil { if first == nil {
return second return second
} }
for k, v := range second { for k, v := range second {