mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 22:17:14 +00:00
fix nil merge map
This commit is contained in:
parent
25c7b6a2c7
commit
9fe2c30609
@ -474,7 +474,7 @@ func makeVolumeHandle(podUID, volSourceSpecName string) string {
|
||||
}
|
||||
|
||||
func mergeMap(first, second map[string]string) map[string]string {
|
||||
if first == nil && second != nil {
|
||||
if first == nil {
|
||||
return second
|
||||
}
|
||||
for k, v := range second {
|
||||
|
Loading…
Reference in New Issue
Block a user