diff --git a/go.mod b/go.mod index 5ef42d20e2..f92b30ec38 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/checkpoint-restore/go-criu/v7 v7.2.0 github.com/containernetworking/plugins v1.9.0 github.com/containers/buildah v1.42.1-0.20260126144005-964d45f717ce - github.com/containers/gvisor-tap-vsock v0.8.7 + github.com/containers/gvisor-tap-vsock v0.8.8 github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 github.com/containers/ocicrypt v1.2.1 github.com/containers/psgo v1.10.0 diff --git a/go.sum b/go.sum index 96d4aa8be6..fb4ad6a894 100644 --- a/go.sum +++ b/go.sum @@ -61,8 +61,8 @@ github.com/containers/buildah v1.42.1-0.20260126144005-964d45f717ce h1:JNPN3qlLt github.com/containers/buildah v1.42.1-0.20260126144005-964d45f717ce/go.mod h1:F10eTynOMnjfEzsX8pmZRIJEb5/3+mTEzmRHXB/6+hk= github.com/containers/common v0.64.2 h1:1xepE7QwQggUXxmyQ1Dbh6Cn0yd7ktk14sN3McSWf5I= github.com/containers/common v0.64.2/go.mod h1:o29GfYy4tefUuShm8mOn2AiL5Mpzdio+viHI7n24KJ4= -github.com/containers/gvisor-tap-vsock v0.8.7 h1:mFMMU5CIXO9sbtsgECc90loUHx15km3AN6Zuhg3X4qM= -github.com/containers/gvisor-tap-vsock v0.8.7/go.mod h1:Rf2gm4Lpac0IZbg8wwQDh7UuKCxHmnxar0hEZ08OXY8= +github.com/containers/gvisor-tap-vsock v0.8.8 h1:5FznbOYMIuaCv8B6zQ7M6wjqP63Lasy0A6GpViEnjTg= +github.com/containers/gvisor-tap-vsock v0.8.8/go.mod h1:m/PzhZWAS6T9pCRH1fLkq2OqbEd6QEUZWjm3FS5F+CE= github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 h1:YOhl3KCie5f4vLmW3N6nnpucD6Wot0bHj2hSzL8ugU8= github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860/go.mod h1:/A6jL8HXzYB4aUQEjlyYImaQTgSw2jYZunSVCwqgaCI= github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA= diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go index 8535a94397..cf56dc3e12 100644 --- a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/configuration.go @@ -7,52 +7,52 @@ import ( type Configuration struct { // Print packets on stderr - Debug bool + Debug bool `yaml:"debug,omitempty"` // Record all packets coming in and out in a file that can be read by Wireshark (pcap) - CaptureFile string + CaptureFile string `yaml:"capture-file,omitempty"` // Length of packet // Larger packets means less packets to exchange for the same amount of data (and less protocol overhead) - MTU int + MTU int `yaml:"mtu,omitempty"` // Network reserved for the virtual network - Subnet string + Subnet string `yaml:"subnet,omitempty"` // IP address of the virtual gateway - GatewayIP string + GatewayIP string `yaml:"gatewayIP,omitempty"` // MAC address of the virtual gateway - GatewayMacAddress string + GatewayMacAddress string `yaml:"gatewayMacAddress,omitempty"` // Built-in DNS records that will be served by the DNS server embedded in the gateway - DNS []Zone + DNS []Zone `yaml:"dns,omitempty"` // List of search domains that will be added in all DHCP replies - DNSSearchDomains []string + DNSSearchDomains []string `yaml:"dnsSearchDomains,omitempty"` // Port forwarding between the machine running the gateway and the virtual network. - Forwards map[string]string + Forwards map[string]string `yaml:"forwards,omitempty"` // Address translation of incoming traffic. // Useful for reaching the host itself (localhost) from the virtual network. - NAT map[string]string + NAT map[string]string `yaml:"nat,omitempty"` // IPs assigned to the gateway that can answer to ARP requests - GatewayVirtualIPs []string + GatewayVirtualIPs []string `yaml:"gatewayVirtualIPs,omitempty"` // DHCP static leases. Allow to assign pre-defined IP to virtual machine based on the MAC address - DHCPStaticLeases map[string]string + DHCPStaticLeases map[string]string `yaml:"dhcpStaticLeases,omitempty"` // Only for Hyperkit // Allow to assign a pre-defined MAC address to an Hyperkit VM - VpnKitUUIDMacAddresses map[string]string + VpnKitUUIDMacAddresses map[string]string `yaml:"vpnKitUUIDMacAddresses,omitempty"` // Protocol to be used. Only for /connect mux - Protocol Protocol + Protocol Protocol `yaml:"-"` // EC2 Metadata Service Access - Ec2MetadataAccess bool + Ec2MetadataAccess bool `yaml:"ec2MetadataAccess,omitempty"` } type Protocol string @@ -71,13 +71,13 @@ const ( ) type Zone struct { - Name string - Records []Record - DefaultIP net.IP + Name string `yaml:"name,omitempty"` + Records []Record `yaml:"records,omitempty"` + DefaultIP net.IP `yaml:"defaultIP,omitempty"` } type Record struct { - Name string - IP net.IP - Regexp *regexp.Regexp + Name string `yaml:"name,omitempty"` + IP net.IP `yaml:"ip,omitempty"` + Regexp *regexp.Regexp `json:",omitempty" yaml:"regexp,omitempty"` } diff --git a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go index e9aa78076e..91e5910181 100644 --- a/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go +++ b/vendor/github.com/containers/gvisor-tap-vsock/pkg/types/handshake.go @@ -19,3 +19,17 @@ type UnexposeRequest struct { Local string `json:"local"` Protocol TransportProtocol `json:"protocol"` } + +type NotificationMessage struct { + NotificationType NotificationType `json:"notification_type"` + MacAddress string `json:"mac_address,omitempty"` +} + +type NotificationType string + +const ( + Ready NotificationType = "ready" + ConnectionEstablished NotificationType = "connection_established" + HypervisorError NotificationType = "hypervisor_error" + ConnectionClosed NotificationType = "connection_closed" +) diff --git a/vendor/modules.txt b/vendor/modules.txt index 69b8b7679e..ab6b229423 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -129,8 +129,8 @@ github.com/containers/buildah/util # github.com/containers/common v0.64.2 ## explicit; go 1.23.3 github.com/containers/common/pkg/strongunits -# github.com/containers/gvisor-tap-vsock v0.8.7 -## explicit; go 1.23.0 +# github.com/containers/gvisor-tap-vsock v0.8.8 +## explicit; go 1.24.0 github.com/containers/gvisor-tap-vsock/pkg/types # github.com/containers/libhvee v0.10.1-0.20250829163521-178d10e67860 ## explicit; go 1.23.3