apps/kubevpn
1
0
Fork 0
mirror of https://github.com/kubenetworks/kubevpn.git synced 2025-12-24 11:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #438 from kubenetworks/hotfix/default-use-spdy-not-websocket-to-portforward

Browse Source 
hotfix: default use spdy not websocket protocol to portforward
This commit is contained in:
naison
2025-02-23 21:42:21 +08:00
committed by GitHub
parent 867aefbc3a 5b39275f5b
commit 86585214d4
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/util/pod.go
View File

@@ -146,10 +146,6 @@ func WaitPod(ctx context.Context, podInterface v12.PodInterface, list v1.ListOpt
}
func PortForwardPod(config *rest.Config, clientset *rest.RESTClient, podName, namespace string, portPair []string, readyChan chan struct{}, stopChan <-chan struct{}, out, errOut io.Writer) error {
err := os.Setenv(string(util.RemoteCommandWebsockets), "true")
if err != nil {
return err
}
url := clientset.
Post().
Resource("pods").
@@ -226,10 +222,6 @@ func GetTopOwnerReferenceBySelector(factory util.Factory, ns, selector string) (
}
func Shell(_ context.Context, clientset *kubernetes.Clientset, config *rest.Config, podName, containerName, ns string, cmd []string) (string, error) {
err := os.Setenv(string(util.RemoteCommandWebsockets), "true")
if err != nil {
return "", err
}
stdin, _, _ := term.StdStreams()
buf := bytes.NewBuffer(nil)
options := exec.ExecOptions{
@@ -247,10 +239,10 @@ func Shell(_ context.Context, clientset *kubernetes.Clientset, config *rest.Conf
PodClient: clientset.CoreV1(),
Config: config,
}
if err = options.Run(); err != nil {
if err := options.Run(); err != nil {
return "", err
}
return strings.TrimRight(buf.String(), "\n"), err
return strings.TrimRight(buf.String(), "\n"), nil
}
func WaitPodToBeReady(ctx context.Context, podInterface v12.PodInterface, selector v1.LabelSelector) error {