fix nits in comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
This commit is contained in:
parent
176088a742
commit
bc85efdb4f
6 changed files with 10 additions and 10 deletions
|
@ -273,7 +273,7 @@ func (c *controller) SetKeys(keys []*types.EncryptionKey) error {
|
|||
}
|
||||
for s, count := range subsysKeys {
|
||||
if count != keyringSize {
|
||||
return fmt.Errorf("incorrect number of keys for susbsystem %v", s)
|
||||
return fmt.Errorf("incorrect number of keys for subsystem %v", s)
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -997,7 +997,7 @@ func (c *controller) NewSandbox(containerID string, options ...SandboxOption) (s
|
|||
|
||||
err = sb.storeUpdate()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("updating the store state of sandbox failed: %v", err)
|
||||
return nil, fmt.Errorf("failed to update the store state of sandbox: %v", err)
|
||||
}
|
||||
|
||||
return sb, nil
|
||||
|
|
|
@ -38,7 +38,7 @@ There are positive performance implication as a result of bypassing the Linux br
|
|||
|
||||
- The driver limits one network per parent interface. The driver does however accommodate secondary subnets to be allocated in a single Docker network for a multi-subnet requirement. The upstream router is responsible for proxy-arping between the two subnets.
|
||||
|
||||
- Any Macvlan container sharing the same subnet can communicate via IP to any other container in the same subnet without a gateway. It is important to note, that the parent will go into promiscuous mode when a container is attached to the parent since each container has a unique MAC address. Alternatively, Ipvlan which is currently a experimental driver uses the same MAC address as the parent interface and thus precluding the need for the parent being promiscuous.
|
||||
- Any Macvlan container sharing the same subnet can communicate via IP to any other container in the same subnet without a gateway. It is important to note, that the parent will go into promiscuous mode when a container is attached to the parent since each container has a unique MAC address. Alternatively, Ipvlan which is currently an experimental driver uses the same MAC address as the parent interface and thus precluding the need for the parent being promiscuous.
|
||||
|
||||
In the following example, `eth0` on the docker host has an IP on the `172.16.86.0/24` network and a default gateway of `172.16.86.1`. The gateway is an external router with an address of `172.16.86.1`. An IP address is not required on the Docker host interface `eth0` in `bridge` mode, it merely needs to be on the proper upstream network to get forwarded by a network switch or network router.
|
||||
|
||||
|
@ -150,7 +150,7 @@ In the case of a host reboot, instead of needing to modify often complex network
|
|||
|
||||
The same holds true if the network is deleted `docker network rm`. If driver created the sub-interface with `docker network create` it will remove the sub-interface link for the operator.
|
||||
|
||||
If the user doesn't want Docker to create and delete the `-o parent` sub-interface, then you simply pass a interface that already exists as the parent link. Parent interfaces such as `eth0` are not deleted, only interfaces that are slave links.
|
||||
If the user doesn't want Docker to create and delete the `-o parent` sub-interface, then you simply pass an interface that already exists as the parent link. Parent interfaces such as `eth0` are not deleted, only interfaces that are slave links.
|
||||
|
||||
For the driver to add/delete the vlan sub-interfaces the format needs to be `-o parent interface_name.vlan_tag`.
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ type Driver interface {
|
|||
// programming to allow the external connectivity dictated by the passed options
|
||||
ProgramExternalConnectivity(nid, eid string, options map[string]interface{}) error
|
||||
|
||||
// RevokeExternalConnectivity aks the driver to remove any external connectivity
|
||||
// RevokeExternalConnectivity asks the driver to remove any external connectivity
|
||||
// programming that was done so far
|
||||
RevokeExternalConnectivity(nid, eid string) error
|
||||
|
||||
|
@ -72,7 +72,7 @@ type Driver interface {
|
|||
// only invoked for the global scope driver.
|
||||
EventNotify(event EventType, nid string, tableName string, key string, value []byte)
|
||||
|
||||
// Type returns the the type of this driver, the network type this driver manages
|
||||
// Type returns the type of this driver, the network type this driver manages
|
||||
Type() string
|
||||
|
||||
// IsBuiltIn returns true if it is a built-in driver
|
||||
|
|
|
@ -81,7 +81,7 @@ func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
|
|||
return err
|
||||
}
|
||||
|
||||
// Temp: We have to create a endpoint object to keep track of the HNS ID for
|
||||
// Temp: We have to create an endpoint object to keep track of the HNS ID for
|
||||
// this endpoint so that we can retrieve it later when the endpoint is deleted.
|
||||
// This seems unnecessary when we already have dockers EID. See if we can pass
|
||||
// the global EID to HNS to use as it's ID, rather than having each HNS assign
|
||||
|
|
|
@ -318,7 +318,7 @@ func TestEndpointJoin(t *testing.T) {
|
|||
}
|
||||
|
||||
if info.Sandbox() == nil {
|
||||
t.Fatalf("Expected an non-empty sandbox key for a joined endpoint. Instead found a empty sandbox key")
|
||||
t.Fatalf("Expected an non-empty sandbox key for a joined endpoint. Instead found an empty sandbox key")
|
||||
}
|
||||
|
||||
// Check endpoint provided container information
|
||||
|
|
|
@ -45,7 +45,7 @@ type Sandbox interface {
|
|||
// EnableService makes a managed container's service available by adding the
|
||||
// endpoint to the service load balancer and service discovery
|
||||
EnableService() error
|
||||
// DisableService removes a managed contianer's endpoints from the load balancer
|
||||
// DisableService removes a managed container's endpoints from the load balancer
|
||||
// and service discovery
|
||||
DisableService() error
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue