mirror of
https://github.com/containers/podman.git
synced 2025-10-18 19:53:58 +08:00
update gvproxy version to 0.8.4
The 0.8.4 has one important fix[1], which could improve #25121. Also it set all places to use same version of gvisor-tap-vsock [1]https://github.com/containers/gvisor-tap-vsock/issues/474 Signed-off-by: Yevhen Vydolob <yvydolob@redhat.com>
This commit is contained in:
25
vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go
generated
vendored
25
vendor/github.com/containers/gvisor-tap-vsock/pkg/types/gvproxy_command.go
generated
vendored
@ -19,6 +19,9 @@ type GvproxyCommand struct {
|
||||
// List of endpoints the user wants to listen to
|
||||
endpoints []string
|
||||
|
||||
// List of service endpoints the user wants to listen to
|
||||
servicesEndpoints []string
|
||||
|
||||
// Map of different sockets provided by user (socket-type flag:socket)
|
||||
sockets map[string]string
|
||||
|
||||
@ -62,6 +65,14 @@ func (c *GvproxyCommand) AddEndpoint(endpoint string) {
|
||||
c.endpoints = append(c.endpoints, endpoint)
|
||||
}
|
||||
|
||||
func (c *GvproxyCommand) AddServiceEndpoint(endpoint string) {
|
||||
if len(c.servicesEndpoints) < 1 {
|
||||
c.servicesEndpoints = []string{}
|
||||
}
|
||||
|
||||
c.servicesEndpoints = append(c.servicesEndpoints, endpoint)
|
||||
}
|
||||
|
||||
func (c *GvproxyCommand) AddVpnkitSocket(socket string) {
|
||||
c.checkSocketsInitialized()
|
||||
c.sockets["listen-vpnkit"] = socket
|
||||
@ -152,6 +163,18 @@ func (c *GvproxyCommand) endpointsToCmdline() []string {
|
||||
return args
|
||||
}
|
||||
|
||||
func (c *GvproxyCommand) servicesEndpointsToCmdline() []string {
|
||||
args := []string{}
|
||||
|
||||
for _, endpoint := range c.servicesEndpoints {
|
||||
if endpoint != "" {
|
||||
args = append(args, "-services", endpoint)
|
||||
}
|
||||
}
|
||||
|
||||
return args
|
||||
}
|
||||
|
||||
// ToCmdline converts Command to a properly formatted command for gvproxy based
|
||||
// on its fields
|
||||
func (c *GvproxyCommand) ToCmdline() []string {
|
||||
@ -160,6 +183,8 @@ func (c *GvproxyCommand) ToCmdline() []string {
|
||||
// listen (endpoints)
|
||||
args = append(args, c.endpointsToCmdline()...)
|
||||
|
||||
args = append(args, c.servicesEndpointsToCmdline()...)
|
||||
|
||||
// debug
|
||||
if c.Debug {
|
||||
args = append(args, "-debug")
|
||||
|
Reference in New Issue
Block a user