diff --git a/pkg/cloudprovider/plugins.go b/pkg/cloudprovider/plugins.go index 19e90b4d50d..c6083e0a859 100644 --- a/pkg/cloudprovider/plugins.go +++ b/pkg/cloudprovider/plugins.go @@ -71,7 +71,7 @@ func CloudProviders() []string { } // GetCloudProvider creates an instance of the named cloud provider, or nil if -// the name is not known. The error return is only used if the named provider +// the name is unknown. The error return is only used if the named provider // was known but failed to initialize. The config parameter specifies the // io.Reader handler of the configuration file for the cloud provider, or nil // for no configuation. diff --git a/plugin/pkg/admission/persistentvolume/label/admission.go b/plugin/pkg/admission/persistentvolume/label/admission.go index 0942c466cb8..f2458e12174 100644 --- a/plugin/pkg/admission/persistentvolume/label/admission.go +++ b/plugin/pkg/admission/persistentvolume/label/admission.go @@ -124,7 +124,7 @@ func (l *persistentVolumeLabel) findAWSEBSLabels(volume *api.PersistentVolume) ( return nil, err } - return labels, err + return labels, nil } // getEBSVolumes returns the AWS Volumes interface for ebs @@ -169,7 +169,7 @@ func (l *persistentVolumeLabel) findGCEPDLabels(volume *api.PersistentVolume) (m return nil, err } - return labels, err + return labels, nil } // getGCECloudProvider returns the GCE cloud provider, for use for querying volume labels