Skip to content

Commit

Permalink
Merge pull request #585 from dverbeir/ipam_sysctl_dot
Browse files Browse the repository at this point in the history
pkg/ipam: convert dots to slashes in interface names for sysctl
  • Loading branch information
jellonek committed Feb 24, 2021
2 parents 8936113 + 9b09f16 commit 47927f5
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions pkg/ipam/ipam_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ import (
)

const (
DisableIPv6SysctlTemplate = "net.ipv6.conf.%s.disable_ipv6"
// Note: use slash as separator so we can have dots in interface name (VLANs)
DisableIPv6SysctlTemplate = "net/ipv6/conf/%s/disable_ipv6"
)

// ConfigureIface takes the result of IPAM plugin and
Expand Down Expand Up @@ -68,8 +69,11 @@ func ConfigureIface(ifName string, res *current.Result) error {

// Read current sysctl value
value, err := sysctl.Sysctl(ipv6SysctlValueName)
if err != nil || value == "0" {
// FIXME: log warning if unable to read sysctl value
if err != nil {
fmt.Fprintf(os.Stderr, "ipam_linux: failed to read sysctl %q: %v\n", ipv6SysctlValueName, err)
continue
}
if value == "0" {
continue
}

Expand Down

0 comments on commit 47927f5

Please sign in to comment.