mirrors/ceph-csi
1
0
Fork 0
mirror of https://github.com/ceph/ceph-csi.git synced 2024-11-18 04:10:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge leftovers; use canary driver-registrar image, as v1.0.0 is not hosted in quay.io

Browse Source 
Signed-off-by: Huamin Chen <hchen@redhat.com>
This commit is contained in:
Huamin Chen 2019-01-15 13:30:59 -05:00
parent 684f753581
commit aed7506d88
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/cephfs/kubernetes/csi-cephfsplugin.yaml
View File

@ -18,7 +18,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: driver-registrar - name: driver-registrar
image: quay.io/k8scsi/driver-registrar:v1.0.0 image: quay.io/k8scsi/driver-registrar:canary
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

2
deploy/rbd/kubernetes/csi-rbdplugin.yaml
View File

@ -19,7 +19,7 @@ spec:
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
containers: containers:
- name: driver-registrar - name: driver-registrar
image: quay.io/k8scsi/driver-registrar:v1.0.0 image: quay.io/k8scsi/driver-registrar:canary
args: args:
- "--v=5" - "--v=5"
- "--csi-address=$(ADDRESS)" - "--csi-address=$(ADDRESS)"

3
pkg/rbd/controllerserver.go
View File

@ -86,9 +86,6 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
volumeNameMutex.LockKey(req.GetName()) volumeNameMutex.LockKey(req.GetName())
defer volumeNameMutex.UnlockKey(req.GetName()) defer volumeNameMutex.UnlockKey(req.GetName())
volumeNameMutex.LockKey(req.GetName())
defer volumeNameMutex.UnlockKey(req.GetName())
// Need to check for already existing volume name, and if found // Need to check for already existing volume name, and if found
// check for the requested capacity and already allocated capacity // check for the requested capacity and already allocated capacity
if exVol, err := getRBDVolumeByName(req.GetName()); err == nil { if exVol, err := getRBDVolumeByName(req.GetName()); err == nil {