github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44506 from caesarxuchao/fix-cross-build

Browse Source 
Automatic merge from submit-queue

fix cross-build

Fix https://github.com/kubernetes/kubernetes/pull/41543#issuecomment-294207870
This commit is contained in:
Kubernetes Submit Queue 2017-04-14 14:51:06 -07:00 committed by GitHub
commit 32e927f4d8
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/util/term/resizeevents_windows.go
View File

@ -20,12 +20,13 @@ import (
"time" "time"
"k8s.io/apimachinery/pkg/util/runtime" "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 // 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 // it to the resizeEvents channel if the size has changed. The goroutine stops when the stop channel
// is closed. // 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() { go func() {
defer runtime.HandleCrash() defer runtime.HandleCrash()

6
pkg/util/term/setsize_unsupported.go
View File

@ -18,7 +18,11 @@ limitations under the License.
package term 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 // NOP
return nil return nil
} }