master
Eliminate too many ExecWithOptions helpers
staging: extract CRI streaming modules with client-go compatibility