Merge pull request #38261 from tanshanshan/more-readable

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.

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