Skip to content

Commit 6d4e2d7

Browse files
authored
Merge pull request kubernetes#87381 from yuxiaobo96/k8s-staticcheck3
staticcheck: pkg/volume/fc, pkg/volume/portworx and pkg/volume/vspher…
2 parents c5cb398 + 72f34b8 commit 6d4e2d7

File tree

4 files changed

+2
-13
lines changed

4 files changed

+2
-13
lines changed

hack/.staticcheck_failures

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@ pkg/volume
2020
pkg/volume/azure_dd
2121
pkg/volume/azure_file
2222
pkg/volume/csi
23-
pkg/volume/fc
2423
pkg/volume/flexvolume
2524
pkg/volume/iscsi
2625
pkg/volume/local
27-
pkg/volume/portworx
2826
pkg/volume/quobyte
2927
pkg/volume/rbd
3028
pkg/volume/storageos
@@ -33,7 +31,6 @@ pkg/volume/util/fsquota
3331
pkg/volume/util/fsquota/common
3432
pkg/volume/util/operationexecutor
3533
pkg/volume/util/subpath
36-
pkg/volume/vsphere_volume
3734
test/e2e/apps
3835
test/e2e/autoscaling
3936
test/integration/deployment

pkg/volume/fc/fc.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,6 @@ func (plugin *fcPlugin) ConstructBlockVolumeSpec(podUID types.UID, volumeName, m
312312
type fcDisk struct {
313313
volName string
314314
podUID types.UID
315-
portal string
316315
wwns []string
317316
lun string
318317
wwids []string

pkg/volume/portworx/portworx.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,7 @@ func (d *portworxVolumeDeleter) Delete() error {
383383

384384
type portworxVolumeProvisioner struct {
385385
*portworxVolume
386-
options volume.VolumeOptions
387-
namespace string
386+
options volume.VolumeOptions
388387
}
389388

390389
var _ volume.Provisioner = &portworxVolumeProvisioner{}

pkg/volume/vsphere_volume/vsphere_volume.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,17 +182,11 @@ type vsphereVolume struct {
182182
podUID types.UID
183183
// Unique identifier of the volume, used to find the disk resource in the provider.
184184
volPath string
185-
// Filesystem type, optional.
186-
fsType string
187-
//diskID for detach disk
188-
diskID string
189185
// Utility interface that provides API calls to the provider to attach/detach disks.
190186
manager vdManager
191187
// Mounter interface that provides system calls to mount the global path to the pod local path.
192188
mounter mount.Interface
193-
// diskMounter provides the interface that is used to mount the actual block device.
194-
diskMounter mount.Interface
195-
plugin *vsphereVolumePlugin
189+
plugin *vsphereVolumePlugin
196190
volume.MetricsProvider
197191
}
198192

0 commit comments

Comments
 (0)