Merge pull request #71294 from Chenditang/verify-golint

pkg/cloudprovider/providers/aws/aws_fakes.go

@@ -354,9 +354,9 @@ func (m *FakeMetadata) GetMetadata(key string) (string, error) {
 		}
 
 		return "", nil
-	} else {
-		return "", nil
 	}
+
+	return "", nil
 }
 
 // FakeELB is a fake ELB client used for testing

pkg/volume/util/util.go

@@ -201,9 +201,9 @@ func PathExists(path string) (bool, error) {
 		return false, nil
 	} else if IsCorruptedMnt(err) {
 		return true, err
-	} else {
-		return false, err
 	}
+
+	return false, err
 }
 
 // IsCorruptedMnt return true if err is about corrupted mount point