Bump Buildah to v1.35.0

As the title says.  This is the last step in the vendor dance for
Podman v5.0.

[NO NEW TESTS NEEDED]

Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
This commit is contained in:
tomsweeneyredhat
2024-03-07 07:49:49 -05:00
parent 15e508a639
commit b234bb55e4
41 changed files with 386 additions and 215 deletions

View File

@@ -93,15 +93,15 @@ func ValidateRoutes(routes []types.Route) error {
func ValidateRoute(route types.Route) error {
if route.Destination.IP == nil {
return fmt.Errorf("route destination ip nil")
return errors.New("route destination ip nil")
}
if route.Destination.Mask == nil {
return fmt.Errorf("route destination mask nil")
return errors.New("route destination mask nil")
}
if route.Gateway == nil {
return fmt.Errorf("route gateway nil")
return errors.New("route gateway nil")
}
// Reparse to ensure destination is valid.
@@ -112,7 +112,7 @@ func ValidateRoute(route types.Route) error {
// check that destination is a network and not an address
if !ip.Equal(ipNet.IP) {
return fmt.Errorf("route destination invalid")
return errors.New("route destination invalid")
}
return nil

View File

@@ -309,7 +309,7 @@ func createIpvlanOrMacvlan(network *types.Network) error {
return errIpvlanNoDHCP
}
if len(network.Subnets) > 0 {
return fmt.Errorf("ipam driver dhcp set but subnets are set")
return errors.New("ipam driver dhcp set but subnets are set")
}
}

View File

@@ -63,7 +63,7 @@ func Setup(opts *SetupOptions) error {
var addr string
if i.HostIP != "" {
addr = fmt.Sprintf("%s/", i.HostIP)
addr = i.HostIP + "/"
}
switch protocol {

View File

@@ -210,7 +210,7 @@ func createBasicSlirpCmdArgs(options *networkOptions, features *slirpFeatures) (
cmdArgs = append(cmdArgs, "--disable-host-loopback")
}
if options.mtu > -1 && features.HasMTU {
cmdArgs = append(cmdArgs, fmt.Sprintf("--mtu=%d", options.mtu))
cmdArgs = append(cmdArgs, "--mtu="+strconv.Itoa(options.mtu))
}
if !options.noPivotRoot && features.HasEnableSandbox {
cmdArgs = append(cmdArgs, "--enable-sandbox")
@@ -221,33 +221,33 @@ func createBasicSlirpCmdArgs(options *networkOptions, features *slirpFeatures) (
if options.cidr != "" {
if !features.HasCIDR {
return nil, fmt.Errorf("cidr not supported")
return nil, errors.New("cidr not supported")
}
cmdArgs = append(cmdArgs, fmt.Sprintf("--cidr=%s", options.cidr))
cmdArgs = append(cmdArgs, "--cidr="+options.cidr)
}
if options.enableIPv6 {
if !features.HasIPv6 {
return nil, fmt.Errorf("enable_ipv6 not supported")
return nil, errors.New("enable_ipv6 not supported")
}
cmdArgs = append(cmdArgs, "--enable-ipv6")
}
if options.outboundAddr != "" {
if !features.HasOutboundAddr {
return nil, fmt.Errorf("outbound_addr not supported")
return nil, errors.New("outbound_addr not supported")
}
cmdArgs = append(cmdArgs, fmt.Sprintf("--outbound-addr=%s", options.outboundAddr))
cmdArgs = append(cmdArgs, "--outbound-addr="+options.outboundAddr)
}
if options.outboundAddr6 != "" {
if !features.HasOutboundAddr || !features.HasIPv6 {
return nil, fmt.Errorf("outbound_addr6 not supported")
return nil, errors.New("outbound_addr6 not supported")
}
if !options.enableIPv6 {
return nil, fmt.Errorf("enable_ipv6=true is required for outbound_addr6")
return nil, errors.New("enable_ipv6=true is required for outbound_addr6")
}
cmdArgs = append(cmdArgs, fmt.Sprintf("--outbound-addr6=%s", options.outboundAddr6))
cmdArgs = append(cmdArgs, "--outbound-addr6="+options.outboundAddr6)
}
return cmdArgs, nil
@@ -300,7 +300,7 @@ func Setup(opts *SetupOptions) (*SetupResult, error) {
var apiSocket string
if havePortMapping && netOptions.isSlirpHostForward {
apiSocket = filepath.Join(opts.Config.Engine.TmpDir, fmt.Sprintf("%s.net", opts.ContainerID))
apiSocket = filepath.Join(opts.Config.Engine.TmpDir, opts.ContainerID+".net")
cmdArgs = append(cmdArgs, "--api-socket", apiSocket)
}
@@ -610,7 +610,7 @@ func SetupRootlessPortMappingViaRLK(opts *SetupOptions, slirpSubnet *net.IPNet,
if stdoutStr != "" {
// err contains full debug log and too verbose, so return stdoutStr
logrus.Debug(err)
return fmt.Errorf("rootlessport " + strings.TrimSuffix(stdoutStr, "\n"))
return errors.New("rootlessport " + strings.TrimSuffix(stdoutStr, "\n"))
}
return err
}