diff --git a/pkg/ip/addr.go b/pkg/ip/addr.go index b4db50b..f3b426b 100644 --- a/pkg/ip/addr.go +++ b/pkg/ip/addr.go @@ -1,3 +1,5 @@ +// +build !aix + // Copyright 2017 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/ip/ipmasq.go b/pkg/ip/ipmasq.go deleted file mode 100644 index 7a549d1..0000000 --- a/pkg/ip/ipmasq.go +++ /dev/null @@ -1,92 +0,0 @@ -// Copyright 2015 CNI authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package ip - -import ( - "fmt" - "net" - - "github.com/coreos/go-iptables/iptables" -) - -// SetupIPMasq installs iptables rules to masquerade traffic -// coming from ipn and going outside of it -func SetupIPMasq(ipn *net.IPNet, chain string, comment string) error { - isV6 := ipn.IP.To4() == nil - - var ipt *iptables.IPTables - var err error - var multicastNet string - - if isV6 { - ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv6) - multicastNet = "ff00::/8" - } else { - ipt, err = iptables.NewWithProtocol(iptables.ProtocolIPv4) - multicastNet = "224.0.0.0/4" - } - if err != nil { - return fmt.Errorf("failed to locate iptables: %v", err) - } - - // Create chain if doesn't exist - exists := false - chains, err := ipt.ListChains("nat") - if err != nil { - return fmt.Errorf("failed to list chains: %v", err) - } - for _, ch := range chains { - if ch == chain { - exists = true - break - } - } - if !exists { - if err = ipt.NewChain("nat", chain); err != nil { - return err - } - } - - // Packets to this network should not be touched - if err := ipt.AppendUnique("nat", chain, "-d", ipn.String(), "-j", "ACCEPT", "-m", "comment", "--comment", comment); err != nil { - return err - } - - // Don't masquerade multicast - pods should be able to talk to other pods - // on the local network via multicast. - if err := ipt.AppendUnique("nat", chain, "!", "-d", multicastNet, "-j", "MASQUERADE", "-m", "comment", "--comment", comment); err != nil { - return err - } - - return ipt.AppendUnique("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment) -} - -// TeardownIPMasq undoes the effects of SetupIPMasq -func TeardownIPMasq(ipn *net.IPNet, chain string, comment string) error { - ipt, err := iptables.New() - if err != nil { - return fmt.Errorf("failed to locate iptables: %v", err) - } - - if err = ipt.Delete("nat", "POSTROUTING", "-s", ipn.String(), "-j", chain, "-m", "comment", "--comment", comment); err != nil { - return err - } - - if err = ipt.ClearChain("nat", chain); err != nil { - return err - } - - return ipt.DeleteChain("nat", chain) -} diff --git a/pkg/ip/link.go b/pkg/ip/link.go index fb8d3d5..d63f49e 100644 --- a/pkg/ip/link.go +++ b/pkg/ip/link.go @@ -1,3 +1,5 @@ +// +build !aix + // Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/ip/route.go b/pkg/ip/route.go index 1325a47..cd02733 100644 --- a/pkg/ip/route.go +++ b/pkg/ip/route.go @@ -1,3 +1,5 @@ +// +build !aix + // Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/ip/route_unspecified.go b/pkg/ip/route_unspecified.go index 7e79fde..d98189b 100644 --- a/pkg/ip/route_unspecified.go +++ b/pkg/ip/route_unspecified.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build !linux +// +build !aix,!linux package ip diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go index aa72e5c..32f78b0 100644 --- a/pkg/ipam/ipam.go +++ b/pkg/ipam/ipam.go @@ -1,3 +1,5 @@ +// +build !aix + // Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkg/ipam/ipam_aix.go b/pkg/ipam/ipam_aix.go new file mode 100644 index 0000000..904b255 --- /dev/null +++ b/pkg/ipam/ipam_aix.go @@ -0,0 +1,28 @@ +// Copyright 2015 CNI authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package ipam + +import ( + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/types" +) + +func ExecAdd(plugin string, netconf []byte) (types.Result, error) { + return invoke.DelegateAdd(plugin, netconf) +} + +func ExecDel(plugin string, netconf []byte) error { + return invoke.DelegateDel(plugin, netconf) +} diff --git a/plugins/ipam/host-local/backend/disk/lock.go b/plugins/ipam/host-local/backend/disk/lock.go index 7241482..11b03bb 100644 --- a/plugins/ipam/host-local/backend/disk/lock.go +++ b/plugins/ipam/host-local/backend/disk/lock.go @@ -1,3 +1,5 @@ +// +build !aix + // Copyright 2015 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plugins/ipam/host-local/backend/disk/lock_aix.go b/plugins/ipam/host-local/backend/disk/lock_aix.go new file mode 100644 index 0000000..2d6a30a --- /dev/null +++ b/plugins/ipam/host-local/backend/disk/lock_aix.go @@ -0,0 +1,50 @@ +// Copyright 2015 CNI authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package disk + +import ( + "os" + "syscall" +) + +// FileLock wraps os.File to be used as a lock using flock +type FileLock struct { + f *os.File +} + +// NewFileLock opens file/dir at path and returns unlocked FileLock object +func NewFileLock(path string) (*FileLock, error) { + f, err := os.Open(path) + if err != nil { + return nil, err + } + + return &FileLock{f}, nil +} + +// Close closes underlying file +func (l *FileLock) Close() error { + return l.f.Close() +} + +// Lock acquires an exclusive lock +func (l *FileLock) Lock() error { + return syscall.FcntlFlock(l.f.Fd(), syscall.F_SETLKW, &syscall.Flock_t{Type: syscall.F_WRLCK}) +} + +// Unlock releases the lock +func (l *FileLock) Unlock() error { + return syscall.FcntlFlock(l.f.Fd(), syscall.F_SETLKW, &syscall.Flock_t{Type: syscall.F_UNLCK}) +} diff --git a/plugins/main/aixwpar/aixwpar.go b/plugins/main/aixwpar/aixwpar.go new file mode 100644 index 0000000..aa984e0 --- /dev/null +++ b/plugins/main/aixwpar/aixwpar.go @@ -0,0 +1,104 @@ +// Copyright 2015 CNI authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "encoding/json" + "errors" + "fmt" + "runtime" + + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types/current" + "github.com/containernetworking/cni/pkg/version" + "github.com/containernetworking/plugins/pkg/ipam" +) + +type NetConf struct { + types.NetConf + MTU int `json:"mtu"` +} + +func init() { + // this ensures that main runs only on main thread (thread group leader). + // since namespace ops (unshare, setns) are done for a single thread, we + // must ensure that the goroutine does not jump from OS thread to thread + runtime.LockOSThread() +} + +func loadConf(bytes []byte) (*NetConf, string, error) { + n := &NetConf{} + if err := json.Unmarshal(bytes, n); err != nil { + return nil, "", fmt.Errorf("failed to load netconf: %v", err) + } + return n, n.CNIVersion, nil +} + +func cmdAdd(args *skel.CmdArgs) error { + n, cniVersion, err := loadConf(args.StdinData) + if err != nil { + return err + } + + iface := ¤t.Interface{} + iface.Name = args.IfName + + // run the IPAM plugin and get back the config to apply + r, err := ipam.ExecAdd(n.IPAM.Type, args.StdinData) + if err != nil { + return err + } + // Convert whatever the IPAM result was into the current Result type + result, err := current.NewResultFromResult(r) + if err != nil { + return err + } + + if len(result.IPs) == 0 { + return errors.New("IPAM plugin returned missing IP config") + } + for _, ipc := range result.IPs { + // All addresses belong to the ipvlan interface + ipc.Interface = current.Int(0) + } + + result.Interfaces = []*current.Interface{iface} + result.DNS = n.DNS + + return types.PrintResult(result, cniVersion) +} + +func cmdDel(args *skel.CmdArgs) error { + n, _, err := loadConf(args.StdinData) + if err != nil { + return err + } + + err = ipam.ExecDel(n.IPAM.Type, args.StdinData) + if err != nil { + return err + } + + if args.Netns == "" { + return nil + } + + return err +} + +func main() { + skel.PluginMain(cmdAdd, cmdDel, version.All) +} diff --git a/plugins/meta/portmap/chain.go b/plugins/meta/portmap/chain.go index f8a53a4..8d9df17 100644 --- a/plugins/meta/portmap/chain.go +++ b/plugins/meta/portmap/chain.go @@ -1,3 +1,5 @@ +//+build !aix + // Copyright 2017 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plugins/meta/portmap/portmap.go b/plugins/meta/portmap/portmap.go index 133dfef..03a6cdc 100644 --- a/plugins/meta/portmap/portmap.go +++ b/plugins/meta/portmap/portmap.go @@ -1,3 +1,5 @@ +//+build !aix + // Copyright 2017 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/plugins/meta/portmap/portmap_aix.go b/plugins/meta/portmap/portmap_aix.go new file mode 100644 index 0000000..91ac0d1 --- /dev/null +++ b/plugins/meta/portmap/portmap_aix.go @@ -0,0 +1,32 @@ +//+build aix +// Copyright 2017 CNI authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "net" +) + +// forwardPorts establishes port forwarding to a given container IP. +// containerIP can be either v4 or v6. +func forwardPorts(config *PortMapConf, containerIP net.IP) error { + return nil +} + +// unforwardPorts deletes any iptables rules created by this plugin. +// It should be idempotent - it will not error if the chain does not exist. +func unforwardPorts(config *PortMapConf) error { + return nil +} diff --git a/plugins/meta/portmap/utils.go b/plugins/meta/portmap/utils.go index a0c9b33..9b5bb5d 100644 --- a/plugins/meta/portmap/utils.go +++ b/plugins/meta/portmap/utils.go @@ -1,3 +1,5 @@ +//+build !aix + // Copyright 2017 CNI authors // // Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/vendor/github.com/containernetworking/cni/pkg/invoke/os_unix.go b/vendor/github.com/containernetworking/cni/pkg/invoke/os_unix.go index bab5737..bd88b11 100644 --- a/vendor/github.com/containernetworking/cni/pkg/invoke/os_unix.go +++ b/vendor/github.com/containernetworking/cni/pkg/invoke/os_unix.go @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// +build darwin dragonfly freebsd linux netbsd opensbd solaris +// +build aix darwin dragonfly freebsd linux netbsd opensbd solaris package invoke