Merge pull request kubernetes#77297 from humblec/fakeclient-csi

Correct errors and remove unwanted code blocks .

Author: k8s-ci-robot

pkg/controller/garbagecollector/graph_builder.go

@@ -180,9 +180,8 @@ func (gb *GraphBuilder) controllerFor(resource schema.GroupVersionResource, kind
 		// need to clone because it's from a shared cache
 		shared.Informer().AddEventHandlerWithResyncPeriod(handlers, ResourceResyncTime)
 		return shared.Informer().GetController(), shared.Informer().GetStore(), nil
-	} else {
-		klog.V(4).Infof("unable to use a shared informer for resource %q, kind %q: %v", resource.String(), kind.String(), err)
 	}
+	klog.V(4).Infof("unable to use a shared informer for resource %q, kind %q: %v", resource.String(), kind.String(), err)
 
 	// TODO: consider store in one storage.
 	klog.V(5).Infof("create storage for resource %s", resource)

pkg/volume/csi/csi_plugin.go

@@ -765,7 +765,7 @@ func (p *csiPlugin) ConstructBlockVolumeSpec(podUID types.UID, specVolName, mapP
 }
 
 // skipAttach looks up CSIDriver object associated with driver name
-// to determine if driver requies attachment volume operation
+// to determine if driver requires attachment volume operation
 func (p *csiPlugin) skipAttach(driver string) (bool, error) {
 	if !utilfeature.DefaultFeatureGate.Enabled(features.CSIDriverRegistry) {
 		return false, nil

pkg/volume/csi/csi_plugin_test.go

@@ -366,7 +366,7 @@ func TestPluginConstructVolumeSpec(t *testing.T) {
 				t.Fatal(err)
 			}
 			if spec == nil {
-				t.Fatal("nil volume.Spec contstructed")
+				t.Fatal("nil volume.Spec constructed")
 			}
 
 			// inspect spec
@@ -474,7 +474,7 @@ func TestPluginConstructVolumeSpecWithInline(t *testing.T) {
 				t.Fatal(err)
 			}
 			if spec == nil {
-				t.Fatal("nil volume.Spec contstructed")
+				t.Fatal("nil volume.Spec constructed")
 			}
 
 			if spec.Name() != tc.specVolID {

pkg/volume/plugins.go

@@ -842,7 +842,7 @@ func (pm *VolumePluginMgr) FindProvisionablePluginByName(name string) (Provision
 	return nil, fmt.Errorf("no provisionable volume plugin matched")
 }
 
-// FindDeletablePluginBySppec fetches a persistent volume plugin by spec.  If
+// FindDeletablePluginBySpec fetches a persistent volume plugin by spec.  If
 // no plugin is found, returns error.
 func (pm *VolumePluginMgr) FindDeletablePluginBySpec(spec *Spec) (DeletableVolumePlugin, error) {
 	volumePlugin, err := pm.FindPluginBySpec(spec)