vendor c/common@0ededd18a1

Update the login tests to reflect the latest changes to allow http{s}
prefixes (again) to address bugzilla.redhat.com/show_bug.cgi?id=2062072.

Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>

vendor/github.com/containers/common/libnetwork/cni/cni_conversion.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cni
@@ -128,15 +129,21 @@ func findPluginByName(plugins []*libcni.NetworkConfig, name string) bool {
 // It returns an array of subnets and an extra bool if dhcp is configured.
 func convertIPAMConfToNetwork(network *types.Network, ipam *ipamConfig, confPath string) error {
 	if ipam.PluginType == types.DHCPIPAMDriver {
-		network.IPAMOptions["driver"] = types.DHCPIPAMDriver
+		network.IPAMOptions[types.Driver] = types.DHCPIPAMDriver
 		return nil
 	}
 
 	if ipam.PluginType != types.HostLocalIPAMDriver {
-		return errors.Errorf("unsupported ipam plugin %s in %s", ipam.PluginType, confPath)
+		// This is not an error. While we only support certain ipam drivers, we
+		// cannot make it fail for unsupported ones. CNI is still able to use them,
+		// just our translation logic cannot convert this into a Network.
+		// For the same reason this is not warning, it would just be annoying for
+		// everyone using a unknown ipam driver.
+		logrus.Infof("unsupported ipam plugin %q in %s", ipam.PluginType, confPath)
+		return nil
 	}
 
-	network.IPAMOptions["driver"] = types.HostLocalIPAMDriver
+	network.IPAMOptions[types.Driver] = types.HostLocalIPAMDriver
 	for _, r := range ipam.Ranges {
 		for _, ipam := range r {
 			s := types.Subnet{}

vendor/github.com/containers/common/libnetwork/cni/cni_exec.go

@@ -16,6 +16,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+//go:build linux
 // +build linux
 
 package cni

vendor/github.com/containers/common/libnetwork/cni/cni_types.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cni

vendor/github.com/containers/common/libnetwork/cni/config.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cni
@@ -197,12 +198,12 @@ func createIPMACVLAN(network *types.Network) error {
 		}
 	}
 	if len(network.Subnets) == 0 {
-		network.IPAMOptions["driver"] = types.DHCPIPAMDriver
+		network.IPAMOptions[types.Driver] = types.DHCPIPAMDriver
 		if network.Internal {
 			return errors.New("internal is not supported with macvlan and dhcp ipam driver")
 		}
 	} else {
-		network.IPAMOptions["driver"] = types.HostLocalIPAMDriver
+		network.IPAMOptions[types.Driver] = types.HostLocalIPAMDriver
 	}
 	return nil
 }

vendor/github.com/containers/common/libnetwork/cni/network.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cni

vendor/github.com/containers/common/libnetwork/cni/run.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package cni

vendor/github.com/containers/common/libnetwork/internal/util/bridge.go

@@ -27,7 +27,7 @@ func CreateBridge(n NetUtil, network *types.Network, usedNetworks []*net.IPNet,
 		}
 	}
 
-	if network.IPAMOptions["driver"] != types.DHCPIPAMDriver {
+	if network.IPAMOptions[types.Driver] != types.DHCPIPAMDriver {
 		if len(network.Subnets) == 0 {
 			freeSubnet, err := GetFreeIPv4NetworkSubnet(usedNetworks, subnetPools)
 			if err != nil {
@@ -63,7 +63,7 @@ func CreateBridge(n NetUtil, network *types.Network, usedNetworks []*net.IPNet,
 				network.Subnets = append(network.Subnets, *freeSubnet)
 			}
 		}
-		network.IPAMOptions["driver"] = types.HostLocalIPAMDriver
+		network.IPAMOptions[types.Driver] = types.HostLocalIPAMDriver
 	}
 	return nil
 }

vendor/github.com/containers/common/libnetwork/internal/util/validate.go

@@ -109,7 +109,7 @@ func validatePerNetworkOpts(network *types.Network, netOpts *types.PerNetworkOpt
 	if netOpts.InterfaceName == "" {
 		return errors.Errorf("interface name on network %s is empty", network.Name)
 	}
-	if network.IPAMOptions["driver"] == types.HostLocalIPAMDriver {
+	if network.IPAMOptions[types.Driver] == types.HostLocalIPAMDriver {
 	outer:
 		for _, ip := range netOpts.StaticIPs {
 			for _, s := range network.Subnets {

vendor/github.com/containers/common/libnetwork/netavark/config.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark
@@ -130,6 +131,7 @@ func (n *netavarkNetwork) networkCreate(newNetwork *types.Network, defaultNet bo
 		if err != nil {
 			return nil, err
 		}
+		defer f.Close()
 		enc := json.NewEncoder(f)
 		enc.SetIndent("", "     ")
 		err = enc.Encode(newNetwork)
@@ -154,7 +156,7 @@ func createMacvlan(network *types.Network) error {
 	if len(network.Subnets) == 0 {
 		return errors.Errorf("macvlan driver needs at least one subnet specified, DHCP is not supported with netavark")
 	}
-	network.IPAMOptions["driver"] = types.HostLocalIPAMDriver
+	network.IPAMOptions[types.Driver] = types.HostLocalIPAMDriver
 
 	// validate the given options, we do not need them but just check to make sure they are valid
 	for key, value := range network.Options {

vendor/github.com/containers/common/libnetwork/netavark/const.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark

vendor/github.com/containers/common/libnetwork/netavark/exec.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark

vendor/github.com/containers/common/libnetwork/netavark/ipam.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark
@@ -361,7 +362,7 @@ func (n *netavarkNetwork) deallocIPs(opts *types.NetworkOptions) error {
 // it checks the ipam driver and if subnets are set
 func requiresIPAMAlloc(network *types.Network) bool {
 	// only do host allocation when driver is set to HostLocalIPAMDriver or unset
-	switch network.IPAMOptions["driver"] {
+	switch network.IPAMOptions[types.Driver] {
 	case "", types.HostLocalIPAMDriver:
 	default:
 		return false

vendor/github.com/containers/common/libnetwork/netavark/network.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark

vendor/github.com/containers/common/libnetwork/netavark/run.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package netavark
@@ -44,6 +45,16 @@ func (n *netavarkNetwork) Setup(namespacePath string, options types.SetupOptions
 		return nil, errors.Wrap(err, "failed to convert net opts")
 	}
 
+	// Warn users if one or more networks have dns enabled
+	// but aardvark-dns binary is not configured
+	for _, network := range netavarkOpts.Networks {
+		if network != nil && network.DNSEnabled && n.aardvarkBinary == "" {
+			// this is not a fatal error we can still use container without dns
+			logrus.Warnf("aardvark-dns binary not found, container dns will not be enabled")
+			break
+		}
+	}
+
 	// trace output to get the json
 	if logrus.IsLevelEnabled(logrus.TraceLevel) {
 		b, err := json.Marshal(&netavarkOpts)

vendor/github.com/containers/common/libnetwork/network/interface.go

@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 package network
@@ -61,11 +62,7 @@ func NetworkBackend(store storage.Store, conf *config.Config, syslog bool) (type
 			return "", nil, err
 		}
 
-		aardvarkBin, err := conf.FindHelperBinary(aardvarkBinary, false)
-		if err != nil {
-			// this is not a fatal error we can still use netavark without dns
-			logrus.Warnf("%s binary not found, container dns will not be enabled", aardvarkBin)
-		}
+		aardvarkBin, _ := conf.FindHelperBinary(aardvarkBinary, false)
 
 		confDir := conf.Network.NetworkConfigDir
 		if confDir == "" {

vendor/github.com/containers/common/libnetwork/types/const.go

@@ -11,6 +11,7 @@ const (
 	IPVLANNetworkDriver = "ipvlan"
 
 	// IPAM drivers
+	Driver = "driver"
 	// HostLocalIPAMDriver store the ip
 	HostLocalIPAMDriver = "host-local"
 	// DHCPIPAMDriver get subnet and ip from dhcp server

vendor/github.com/containers/common/libnetwork/util/filters.go

@@ -29,7 +29,7 @@ func createFilterFuncs(key string, filterValues []string) (types.FilterFunc, err
 			return util.StringMatchRegexSlice(net.Name, filterValues)
 		}, nil
 
-	case "driver":
+	case types.Driver:
 		// matches network driver
 		return func(net types.Network) bool {
 			return util.StringInSlice(net.Driver, filterValues)