mirror of
https://github.com/kubernetes/client-go.git
synced 2026-05-14 19:17:56 +00:00
804ee8c42e
Normal execution always started to trigger this after adding more logging in
the E2E framework's exec_util.go:
I0506 21:23:56.781188 6341 exec_util.go:201] unexpected error trying to use websockets for pod exec: <nil>
That the "should fall back" implementation gets called when there is no error
and thus no reason to even consider falling back is odd. Now the execute
implementation checks for nil first.
This is the same approach taken also in the portforward code:
b35c5c0a30/staging/src/k8s.io/client-go/tools/portforward/fallback_dialer.go (L52)
Kubernetes-commit: 35870c480d64a8ae35c0e5839cc40b0115b7328a
61 lines
2.0 KiB
Go
61 lines
2.0 KiB
Go
/*
|
|
Copyright 2023 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package remotecommand
|
|
|
|
import (
|
|
"context"
|
|
|
|
"k8s.io/klog/v2"
|
|
)
|
|
|
|
var _ Executor = &FallbackExecutor{}
|
|
|
|
type FallbackExecutor struct {
|
|
primary Executor
|
|
secondary Executor
|
|
shouldFallback func(error) bool
|
|
}
|
|
|
|
// NewFallbackExecutor creates an Executor that first attempts to use the
|
|
// WebSocketExecutor, falling back to the legacy SPDYExecutor if the initial
|
|
// websocket "StreamWithContext" call fails.
|
|
// func NewFallbackExecutor(config *restclient.Config, method string, url *url.URL) (Executor, error) {
|
|
func NewFallbackExecutor(primary, secondary Executor, shouldFallback func(error) bool) (Executor, error) {
|
|
return &FallbackExecutor{
|
|
primary: primary,
|
|
secondary: secondary,
|
|
shouldFallback: shouldFallback,
|
|
}, nil
|
|
}
|
|
|
|
// Stream is deprecated. Please use "StreamWithContext".
|
|
func (f *FallbackExecutor) Stream(options StreamOptions) error {
|
|
return f.StreamWithContext(context.Background(), options)
|
|
}
|
|
|
|
// StreamWithContext initially attempts to call "StreamWithContext" using the
|
|
// primary executor, falling back to calling the secondary executor if the
|
|
// initial primary call to upgrade to a websocket connection fails.
|
|
func (f *FallbackExecutor) StreamWithContext(ctx context.Context, options StreamOptions) error {
|
|
err := f.primary.StreamWithContext(ctx, options)
|
|
if err != nil && f.shouldFallback(err) {
|
|
klog.V(4).Infof("RemoteCommand fallback: %v", err)
|
|
return f.secondary.StreamWithContext(ctx, options)
|
|
}
|
|
return err
|
|
}
|