|
@@ -88,7 +88,7 @@ type NetworkInfo interface {
|
|
type EndpointWalker func(ep Endpoint) bool
|
|
type EndpointWalker func(ep Endpoint) bool
|
|
|
|
|
|
// ipInfo is the reverse mapping from IP to service name to serve the PTR query.
|
|
// ipInfo is the reverse mapping from IP to service name to serve the PTR query.
|
|
-// extResolver is set if an externl server resolves a service name to this IP.
|
|
|
|
|
|
+// extResolver is set if an external server resolves a service name to this IP.
|
|
// Its an indication to defer PTR queries also to that external server.
|
|
// Its an indication to defer PTR queries also to that external server.
|
|
type ipInfo struct {
|
|
type ipInfo struct {
|
|
name string
|
|
name string
|
|
@@ -1654,7 +1654,7 @@ func (n *network) ipamAllocateVersion(ipVer int, ipam ipamapi.Ipam) error {
|
|
return types.BadRequestErrorf("non parsable secondary ip address (%s:%s) passed for network %s", k, v, n.Name())
|
|
return types.BadRequestErrorf("non parsable secondary ip address (%s:%s) passed for network %s", k, v, n.Name())
|
|
}
|
|
}
|
|
if !d.Pool.Contains(ip) {
|
|
if !d.Pool.Contains(ip) {
|
|
- return types.ForbiddenErrorf("auxilairy address: (%s:%s) must belong to the master pool: %s", k, v, d.Pool)
|
|
|
|
|
|
+ return types.ForbiddenErrorf("auxiliary address: (%s:%s) must belong to the master pool: %s", k, v, d.Pool)
|
|
}
|
|
}
|
|
// Attempt reservation in the container addressable pool, silent the error if address does not belong to that pool
|
|
// Attempt reservation in the container addressable pool, silent the error if address does not belong to that pool
|
|
if d.IPAMData.AuxAddresses[k], _, err = ipam.RequestAddress(d.PoolID, ip, nil); err != nil && err != ipamapi.ErrIPOutOfRange {
|
|
if d.IPAMData.AuxAddresses[k], _, err = ipam.RequestAddress(d.PoolID, ip, nil); err != nil && err != ipamapi.ErrIPOutOfRange {
|
|
@@ -2036,7 +2036,7 @@ func (n *network) ResolveService(name string) ([]*net.SRV, []net.IP) {
|
|
|
|
|
|
logrus.Debugf("Service name To resolve: %v", name)
|
|
logrus.Debugf("Service name To resolve: %v", name)
|
|
|
|
|
|
- // There are DNS implementaions that allow SRV queries for names not in
|
|
|
|
|
|
+ // There are DNS implementations that allow SRV queries for names not in
|
|
// the format defined by RFC 2782. Hence specific validations checks are
|
|
// the format defined by RFC 2782. Hence specific validations checks are
|
|
// not done
|
|
// not done
|
|
parts := strings.Split(name, ".")
|
|
parts := strings.Split(name, ".")
|