Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/ip/ipmasq_iptables_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func gcIPMasqIPTables(_ string, _ []types.GCAttachment) error {
return nil
}

// isNotExist returnst true if the error is from iptables indicating
// isNotExist returns true if the error is from iptables indicating
// that the target does not exist.
func isNotExist(err error) bool {
e, ok := err.(*iptables.Error)
Expand Down
6 changes: 3 additions & 3 deletions plugins/main/bridge/bridge.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,12 @@ func ensureVlanInterface(br *netlink.Bridge, vlanID int, preserveDefaultVlan boo

hostNS, err := ns.GetCurrentNS()
if err != nil {
return nil, fmt.Errorf("faild to find host namespace: %v", err)
return nil, fmt.Errorf("failed to find host namespace: %v", err)
}

_, brGatewayIface, err := setupVeth(hostNS, br, name, br.MTU, false, vlanID, nil, preserveDefaultVlan, "", false)
if err != nil {
return nil, fmt.Errorf("faild to create vlan gateway %q: %v", name, err)
return nil, fmt.Errorf("failed to create vlan gateway %q: %v", name, err)
}

brGatewayVeth, err = netlinksafe.LinkByName(brGatewayIface.Name)
Expand Down Expand Up @@ -1044,7 +1044,7 @@ func cmdCheck(args *skel.CmdArgs) error {
var contCNI, vethCNI cniBridgeIf
var brMap, contMap current.Interface

// Find interfaces for names whe know, CNI Bridge and container
// Find interfaces for names we know, CNI Bridge and container
for _, intf := range result.Interfaces {
if n.BrName == intf.Name {
brMap = *intf
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/dummy/dummy.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for name whe know, that of dummy device inside container
// Find interfaces for name we know, that of dummy device inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/host-device/host-device.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ func moveLinkIn(hostDev netlink.Link, containerNs ns.NetNS, containerIfName stri
return fmt.Errorf("failed to find %q in tempNS: %v", hostDevName, err)
}

// detroying a non empty tempNS would move physical devices back to the initial net namespace,
// destroying a non empty tempNS would move physical devices back to the initial net namespace,
// not the namespace of the "parent" process, and virtual devices would be destroyed,
// so we need to actively move the device back to hostNS on error
defer func() {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/ipvlan/ipvlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for names whe know, ipvlan inside container
// Find interfaces for names we know, ipvlan inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/macvlan/macvlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for names whe know, macvlan device name inside container
// Find interfaces for names we know, macvlan device name inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/ptp/ptp.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for name whe know, that of host-device inside container
// Find interfaces for name we know, that of host-device inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/tap/tap.go
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for names whe know, tap device name inside container
// Find interfaces for names we know, tap device name inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/main/vlan/vlan.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func cmdCheck(args *skel.CmdArgs) error {
}

var contMap current.Interface
// Find interfaces for name whe know, that of host-device inside container
// Find interfaces for name we know, that of host-device inside container
for _, intf := range result.Interfaces {
if args.IfName == intf.Name {
if args.Netns == intf.Sandbox {
Expand Down
2 changes: 1 addition & 1 deletion plugins/meta/portmap/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// This has one notable limitation: it does not perform any kind of reservation
// of the actual host port. If there is a service on the host, it will have all
// its traffic captured by the container. If another container also claims a given
// port, it will caputure the traffic - it is last-write-wins.
// port, it will capture the traffic - it is last-write-wins.
package main

import (
Expand Down
Loading