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

fix nil merge map

Browse Source
This commit is contained in:
astraw99 2021-09-19 18:44:31 +08:00
parent 25c7b6a2c7
commit 9fe2c30609
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,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 {