From a3c1a6da027233606f45fd01315520b3fc4d117a Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 1 May 2019 13:36:52 +0530 Subject: [PATCH 1/2] Error message corrections Signed-off-by: Humble Chirammal --- pkg/volume/csi/csi_plugin.go | 2 +- pkg/volume/csi/csi_plugin_test.go | 4 ++-- pkg/volume/plugins.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/volume/csi/csi_plugin.go b/pkg/volume/csi/csi_plugin.go index 8698c542e78..4c73484f02b 100644 --- a/pkg/volume/csi/csi_plugin.go +++ b/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 diff --git a/pkg/volume/csi/csi_plugin_test.go b/pkg/volume/csi/csi_plugin_test.go index 6d4354973b6..0ec0a2410bc 100644 --- a/pkg/volume/csi/csi_plugin_test.go +++ b/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 { diff --git a/pkg/volume/plugins.go b/pkg/volume/plugins.go index 8b9fce20e9a..9e3ef7500cc 100644 --- a/pkg/volume/plugins.go +++ b/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) From 4d56ab19e4405fcbeaf16f59d2ea2132b896417e Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Wed, 1 May 2019 13:44:24 +0530 Subject: [PATCH 2/2] Remove unwanted conditions from controllers. Signed-off-by: Humble Chirammal --- pkg/controller/garbagecollector/graph_builder.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/controller/garbagecollector/graph_builder.go b/pkg/controller/garbagecollector/graph_builder.go index c48f1dd655c..ab9e45470e9 100644 --- a/pkg/controller/garbagecollector/graph_builder.go +++ b/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)