Merge pull request #87381 from yuxiaobo96/k8s-staticcheck3

staticcheck: pkg/volume/fc, pkg/volume/portworx and pkg/volume/vspher…
This commit is contained in:
Kubernetes Prow Robot 2020-02-07 18:32:58 -08:00 committed by GitHub
commit 6d4e2d722e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 13 deletions

View File

@ -20,11 +20,9 @@ pkg/volume
pkg/volume/azure_dd pkg/volume/azure_dd
pkg/volume/azure_file pkg/volume/azure_file
pkg/volume/csi pkg/volume/csi
pkg/volume/fc
pkg/volume/flexvolume pkg/volume/flexvolume
pkg/volume/iscsi pkg/volume/iscsi
pkg/volume/local pkg/volume/local
pkg/volume/portworx
pkg/volume/quobyte pkg/volume/quobyte
pkg/volume/rbd pkg/volume/rbd
pkg/volume/storageos pkg/volume/storageos
@ -33,7 +31,6 @@ pkg/volume/util/fsquota
pkg/volume/util/fsquota/common pkg/volume/util/fsquota/common
pkg/volume/util/operationexecutor pkg/volume/util/operationexecutor
pkg/volume/util/subpath pkg/volume/util/subpath
pkg/volume/vsphere_volume
test/e2e/apps test/e2e/apps
test/e2e/autoscaling test/e2e/autoscaling
test/integration/deployment test/integration/deployment

View File

@ -312,7 +312,6 @@ func (plugin *fcPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName, m
type fcDisk struct { type fcDisk struct {
volName string volName string
podUID types.UID podUID types.UID
portal string
wwns []string wwns []string
lun string lun string
wwids []string wwids []string

View File

@ -383,8 +383,7 @@ func (d *portworxVolumeDeleter) Delete() error {
type portworxVolumeProvisioner struct { type portworxVolumeProvisioner struct {
*portworxVolume *portworxVolume
options volume.VolumeOptions options volume.VolumeOptions
namespace string
} }
var _ volume.Provisioner = &portworxVolumeProvisioner{} var _ volume.Provisioner = &portworxVolumeProvisioner{}

View File

@ -182,17 +182,11 @@ type vsphereVolume struct {
podUID types.UID podUID types.UID
// Unique identifier of the volume, used to find the disk resource in the provider. // Unique identifier of the volume, used to find the disk resource in the provider.
volPath string volPath string
// Filesystem type, optional.
fsType string
//diskID for detach disk
diskID string
// Utility interface that provides API calls to the provider to attach/detach disks. // Utility interface that provides API calls to the provider to attach/detach disks.
manager vdManager manager vdManager
// Mounter interface that provides system calls to mount the global path to the pod local path. // Mounter interface that provides system calls to mount the global path to the pod local path.
mounter mount.Interface mounter mount.Interface
// diskMounter provides the interface that is used to mount the actual block device. plugin *vsphereVolumePlugin
diskMounter mount.Interface
plugin *vsphereVolumePlugin
volume.MetricsProvider volume.MetricsProvider
} }