github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97965 from chymy/fix-spell

Browse Source 
Fix some case issue
This commit is contained in:
Kubernetes Prow Robot 2021-05-16 06:31:59 -07:00 committed by GitHub
commit d01a5cae9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/volume/awsebs/aws_util.go
View File

@ -116,7 +116,7 @@ func (util *AWSDiskUtil) CreateVolume(c *awsElasticBlockStoreProvisioner, node *
labels, err := cloud.GetVolumeLabels(name) labels, err := cloud.GetVolumeLabels(name)
if err != nil { if err != nil {
// We don't really want to leak the volume here... // We don't really want to leak the volume here...
klog.Errorf("error building labels for new EBS volume %q: %v", name, err) klog.Errorf("Error building labels for new EBS volume %q: %v", name, err)
} }
fstype := "" fstype := ""
@ -232,14 +232,14 @@ func getDiskByIDPaths(volumeID aws.KubernetesVolumeID, partition string, deviceP
// and we have to get the volume id from the nvme interface // and we have to get the volume id from the nvme interface
awsVolumeID, err := volumeID.MapToAWSVolumeID() awsVolumeID, err := volumeID.MapToAWSVolumeID()
if err != nil { if err != nil {
klog.Warningf("error mapping volume %q to AWS volume: %v", volumeID, err) klog.Warningf("Error mapping volume %q to AWS volume: %v", volumeID, err)
} else { } else {
// This is the magic name on which AWS presents NVME devices under /dev/disk/by-id/ // This is the magic name on which AWS presents NVME devices under /dev/disk/by-id/
// For example, vol-0fab1d5e3f72a5e23 creates a symlink at /dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0fab1d5e3f72a5e23 // For example, vol-0fab1d5e3f72a5e23 creates a symlink at /dev/disk/by-id/nvme-Amazon_Elastic_Block_Store_vol0fab1d5e3f72a5e23
nvmeName := "nvme-Amazon_Elastic_Block_Store_" + strings.Replace(string(awsVolumeID), "-", "", -1) nvmeName := "nvme-Amazon_Elastic_Block_Store_" + strings.Replace(string(awsVolumeID), "-", "", -1)
nvmePath, err := findNvmeVolume(nvmeName) nvmePath, err := findNvmeVolume(nvmeName)
if err != nil { if err != nil {
klog.Warningf("error looking for nvme volume %q: %v", volumeID, err) klog.Warningf("Error looking for nvme volume %q: %v", volumeID, err)
} else if nvmePath != "" { } else if nvmePath != "" {
if partition != "" { if partition != "" {
nvmePath = nvmePath + nvmeDiskPartitionSuffix + partition nvmePath = nvmePath + nvmeDiskPartitionSuffix + partition
@ -251,7 +251,7 @@ func getDiskByIDPaths(volumeID aws.KubernetesVolumeID, partition string, deviceP
return devicePaths return devicePaths
} }
// Return cloud provider // Returns cloud provider
func getCloudProvider(cloudProvider cloudprovider.Interface) (*aws.Cloud, error) { func getCloudProvider(cloudProvider cloudprovider.Interface) (*aws.Cloud, error) {
awsCloudProvider, ok := cloudProvider.(*aws.Cloud) awsCloudProvider, ok := cloudProvider.(*aws.Cloud)
if !ok || awsCloudProvider == nil { if !ok || awsCloudProvider == nil {