mirror of https://github.com/k3s-io/k3s
Merge pull request #44506 from caesarxuchao/fix-cross-build
Automatic merge from submit-queue fix cross-build Fix https://github.com/kubernetes/kubernetes/pull/41543#issuecomment-294207870pull/6/head
commit
32e927f4d8
|
@ -20,12 +20,13 @@ import (
|
|||
"time"
|
||||
|
||||
"k8s.io/apimachinery/pkg/util/runtime"
|
||||
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
|
||||
)
|
||||
|
||||
// monitorResizeEvents spawns a goroutine that periodically gets the terminal size and tries to send
|
||||
// it to the resizeEvents channel if the size has changed. The goroutine stops when the stop channel
|
||||
// is closed.
|
||||
func monitorResizeEvents(fd uintptr, resizeEvents chan<- Size, stop chan struct{}) {
|
||||
func monitorResizeEvents(fd uintptr, resizeEvents chan<- remotecommand.TerminalSize, stop chan struct{}) {
|
||||
go func() {
|
||||
defer runtime.HandleCrash()
|
||||
|
||||
|
|
|
@ -18,7 +18,11 @@ limitations under the License.
|
|||
|
||||
package term
|
||||
|
||||
func SetSize(fd uintptr, size Size) error {
|
||||
import (
|
||||
"k8s.io/kubernetes/pkg/client/unversioned/remotecommand"
|
||||
)
|
||||
|
||||
func SetSize(fd uintptr, size remotecommand.TerminalSize) error {
|
||||
// NOP
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue