github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76960 from harsh-px/automated-cherry-pick-of-#76341-upstream-release-1.14 

Automated cherry pick of #76341: Fix concurrent map access in Portworx create volume call
pull/564/head
Kubernetes Prow Robot 2019-05-08 04:34:36 -07:00 committed by GitHub
parent 399e37ba2e 9141812ee6
commit 3a208b6893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/portworx/portworx_util.go
View File

@ -72,12 +72,14 @@ func (util *portworxVolumeUtil) CreateVolume(p *portworxVolumeProvisioner) (stri
}
// Pass all parameters as volume labels for Portworx server-side processing
if len(p.options.Parameters) > 0 {
spec.VolumeLabels = p.options.Parameters
} else {
if spec.VolumeLabels == nil {
spec.VolumeLabels = make(map[string]string, 0)
}
for k, v := range p.options.Parameters {
spec.VolumeLabels[k] = v
}
// Update the requested size in the spec
spec.Size = uint64(requestGiB * volumehelpers.GiB)