mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
vendor: update containers/common
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
3
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
3
vendor/github.com/containers/common/libnetwork/cni/config.go
generated
vendored
@@ -36,6 +36,9 @@ func (n *cniNetwork) NetworkCreate(net types.Network) (types.Network, error) {
|
||||
// networkCreate will fill out the given network struct and return the new network entry.
|
||||
// If defaultNet is true it will not validate against used subnets and it will not write the cni config to disk.
|
||||
func (n *cniNetwork) networkCreate(newNetwork *types.Network, defaultNet bool) (*network, error) {
|
||||
if len(newNetwork.NetworkDNSServers) > 0 {
|
||||
return nil, fmt.Errorf("NetworkDNSServers cannot be configured for backend CNI: %w", types.ErrInvalidArg)
|
||||
}
|
||||
// if no driver is set use the default one
|
||||
if newNetwork.Driver == "" {
|
||||
newNetwork.Driver = types.DefaultNetworkDriver
|
||||
|
||||
11
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
11
vendor/github.com/containers/common/libnetwork/netavark/config.go
generated
vendored
@@ -137,6 +137,17 @@ func (n *netavarkNetwork) networkCreate(newNetwork *types.Network, defaultNet bo
|
||||
// when we do not have ipam we must disable dns
|
||||
internalutil.IpamNoneDisableDNS(newNetwork)
|
||||
|
||||
// process NetworkDNSServers
|
||||
if len(newNetwork.NetworkDNSServers) > 0 && !newNetwork.DNSEnabled {
|
||||
return nil, fmt.Errorf("Cannot set NetworkDNSServers if DNS is not enabled for the network: %w", types.ErrInvalidArg)
|
||||
}
|
||||
// validate ip address
|
||||
for _, dnsServer := range newNetwork.NetworkDNSServers {
|
||||
if net.ParseIP(dnsServer) == nil {
|
||||
return nil, fmt.Errorf("Unable to parse ip %s specified in NetworkDNSServers: %w", dnsServer, types.ErrInvalidArg)
|
||||
}
|
||||
}
|
||||
|
||||
// add gateway when not internal or dns enabled
|
||||
addGateway := !newNetwork.Internal || newNetwork.DNSEnabled
|
||||
err = internalutil.ValidateSubnets(newNetwork, addGateway, usedNetworks)
|
||||
|
||||
4
vendor/github.com/containers/common/libnetwork/types/network.go
generated
vendored
4
vendor/github.com/containers/common/libnetwork/types/network.go
generated
vendored
@@ -56,6 +56,10 @@ type Network struct {
|
||||
// DNSEnabled is whether name resolution is active for container on
|
||||
// this Network. Only supported with the bridge driver.
|
||||
DNSEnabled bool `json:"dns_enabled"`
|
||||
// List of custom DNS server for podman's DNS resolver at network level,
|
||||
// all the containers attached to this network will consider resolvers
|
||||
// configured at network level.
|
||||
NetworkDNSServers []string `json:"network_dns_servers,omitempty"`
|
||||
// Labels is a set of key-value labels that have been applied to the
|
||||
// Network.
|
||||
Labels map[string]string `json:"labels,omitempty"`
|
||||
|
||||
Reference in New Issue
Block a user