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

build: address dupword warnings

Browse Source 
Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos 2023-06-02 14:39:58 +02:00 committed by mergify[bot]
parent 9e76eceb5e
commit c968f6407d
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/rbd_helper.go
View File

@ -792,6 +792,8 @@ func sparsifyBackingRBDImage(f *framework.Framework, pvc *v1.PersistentVolumeCla
func deletePool(name string, cephFS bool, f *framework.Framework) error { func deletePool(name string, cephFS bool, f *framework.Framework) error {
cmds := []string{} cmds := []string{}
if cephFS { if cephFS {
//nolint:dupword // "ceph osd pool delete" requires the pool 2x
//
// ceph fs fail // ceph fs fail
// ceph fs rm myfs --yes-i-really-mean-it // ceph fs rm myfs --yes-i-really-mean-it
// ceph osd pool delete myfs-metadata myfs-metadata // ceph osd pool delete myfs-metadata myfs-metadata
@ -803,6 +805,8 @@ func deletePool(name string, cephFS bool, f *framework.Framework) error {
fmt.Sprintf("ceph osd pool delete %s-metadata %s-metadata --yes-i-really-really-mean-it", name, name), fmt.Sprintf("ceph osd pool delete %s-metadata %s-metadata --yes-i-really-really-mean-it", name, name),
fmt.Sprintf("ceph osd pool delete %s-replicated %s-replicated --yes-i-really-really-mean-it", name, name)) fmt.Sprintf("ceph osd pool delete %s-replicated %s-replicated --yes-i-really-really-mean-it", name, name))
} else { } else {
//nolint:dupword // "ceph osd pool delete" requires the pool 2x
//
// ceph osd pool delete replicapool replicapool // ceph osd pool delete replicapool replicapool
// --yes-i-really-mean-it // --yes-i-really-mean-it
cmds = append(cmds, fmt.Sprintf("ceph osd pool delete %s %s --yes-i-really-really-mean-it", name, name)) cmds = append(cmds, fmt.Sprintf("ceph osd pool delete %s %s --yes-i-really-really-mean-it", name, name))

4
internal/rbd/controllerserver.go
View File

@ -308,8 +308,8 @@ func (cs *ControllerServer) CreateVolume(
return nil, err return nil, err
} }
// TODO: create/get a connection from the the ConnPool, and do not pass // TODO: create/get a connection from the ConnPool, and do not pass the
// the credentials to any of the utility functions. // credentials to any of the utility functions.
cr, err := util.NewUserCredentialsWithMigration(req.GetSecrets()) cr, err := util.NewUserCredentialsWithMigration(req.GetSecrets())
if err != nil { if err != nil {

2
internal/rbd/nodeserver.go
View File

@ -1023,7 +1023,7 @@ func (ns *NodeServer) NodeUnstageVolume(
} }
// It was not mounted and image metadata is also missing, we are done as the last step in // It was not mounted and image metadata is also missing, we are done as the last step in
// in the staging transaction is complete // the staging transaction is complete
return &csi.NodeUnstageVolumeResponse{}, nil return &csi.NodeUnstageVolumeResponse{}, nil
} }