containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24394 from vyasgun/pr/gvproxy080 

Update gvproxy to v0.8.0 and disable ssh port forwarding on wsl
This commit is contained in:
openshift-merge-bot[bot] 2024-11-07 12:20:14 +00:00 committed by GitHub
parent b209474d66 4e8d2dd726
commit cbb5d7f14b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -218,7 +218,7 @@ endif
# gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads # gvisor-tap-vsock version for gvproxy.exe and win-sshproxy.exe downloads
# the upstream project ships pre-built binaries since version 0.7.1 # the upstream project ships pre-built binaries since version 0.7.1
GV_VERSION=v0.7.5 GV_VERSION=v0.8.0
### ###
### Primary entry-point targets ### Primary entry-point targets

2
contrib/pkginstaller/Makefile
View File

@ -6,7 +6,7 @@ ifeq ($(ARCH), aarch64)
else else
GOARCH:=$(ARCH) GOARCH:=$(ARCH)
endif endif
GVPROXY_VERSION ?= 0.7.5 GVPROXY_VERSION ?= 0.8.0
VFKIT_VERSION ?= 0.5.1 VFKIT_VERSION ?= 0.5.1
KRUNKIT_VERSION ?= 0.1.3 KRUNKIT_VERSION ?= 0.1.3
GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin GVPROXY_RELEASE_URL ?= https://github.com/containers/gvisor-tap-vsock/releases/download/v$(GVPROXY_VERSION)/gvproxy-darwin

7
pkg/machine/e2e/init_windows_test.go
View File

@ -2,6 +2,7 @@ package e2e_test
import ( import (
"fmt" "fmt"
"net"
"os" "os"
"path/filepath" "path/filepath"
@ -44,8 +45,12 @@ var _ = Describe("podman machine init - windows only", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(inspectSession).To(Exit(0)) Expect(inspectSession).To(Exit(0))
Expect(inspectSession.outputToString()).To(Equal("true")) Expect(inspectSession.outputToString()).To(Equal("true"))
})
// Ensure port 2222 is free
listener, err := net.Listen("tcp", "0.0.0.0:2222")
Expect(err).ToNot(HaveOccurred())
defer listener.Close()
})
It("init should not should not overwrite existing HyperV vms", func() { It("init should not should not overwrite existing HyperV vms", func() {
skipIfNotVmtype(define.HyperVVirt, "HyperV test only") skipIfNotVmtype(define.HyperVVirt, "HyperV test only")
name := randomString() name := randomString()

2
pkg/machine/wsl/usermodenet.go
View File

@ -32,7 +32,7 @@ fi
if [[ ! $ROUTE =~ default\ via ]]; then if [[ ! $ROUTE =~ default\ via ]]; then
exit 3 exit 3
fi fi
nohup $GVFORWARDER -iface podman-usermode -stop-if-exist ignore -url "stdio:$GVPROXY?listen-stdio=accept" > /var/log/vm.log 2> /var/log/vm.err < /dev/null & nohup $GVFORWARDER -iface podman-usermode -stop-if-exist ignore -url "stdio:$GVPROXY?listen-stdio=accept&ssh-port=-1" > /var/log/vm.log 2> /var/log/vm.err < /dev/null &
echo $! > $STATE/vm.pid echo $! > $STATE/vm.pid
sleep 1 sleep 1
ps -eo args | grep -q -m1 ^$GVFORWARDER || exit 42 ps -eo args | grep -q -m1 ^$GVFORWARDER || exit 42

2
winmake.ps1
View File

@ -279,7 +279,7 @@ switch ($target) {
if ($args.Count -gt 1) { if ($args.Count -gt 1) {
$ref = $args[1] $ref = $args[1]
} }
Win-SSHProxy -Ref $ref Win-SSHProxy($ref)
} }
'installer' { 'installer' {
if ($args.Count -gt 1) { if ($args.Count -gt 1) {