From ed5f8dfeb2b329bca1f7ed87f78101f21a410853 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Wed, 4 May 2016 16:06:05 +0200 Subject: [PATCH] *: appc/cni -> containernetworking/cni The project has been moved so internally we simply rename everything. Consumers are recommended to update their vendored version of cni. --- CONTRIBUTING.md | 4 ++-- Documentation/dhcp.md | 2 +- Documentation/host-local.md | 2 +- Godeps/Godeps.json | 2 +- README.md | 10 +++++----- build | 2 +- cnitool/cni.go | 2 +- libcni/api.go | 4 ++-- pkg/invoke/delegate.go | 2 +- pkg/invoke/exec.go | 2 +- pkg/invoke/find_test.go | 2 +- pkg/ip/link.go | 2 +- pkg/ipam/ipam.go | 6 +++--- pkg/ns/ns_test.go | 4 ++-- pkg/skel/skel.go | 2 +- pkg/testhelpers/testhelpers_test.go | 2 +- pkg/types/args_test.go | 2 +- plugins/ipam/dhcp/daemon.go | 4 ++-- plugins/ipam/dhcp/lease.go | 4 ++-- plugins/ipam/dhcp/main.go | 4 ++-- plugins/ipam/dhcp/options.go | 2 +- plugins/ipam/dhcp/options_test.go | 2 +- plugins/ipam/host-local/allocator.go | 6 +++--- plugins/ipam/host-local/config.go | 2 +- plugins/ipam/host-local/main.go | 6 +++--- plugins/main/bridge/bridge.go | 12 ++++++------ plugins/main/ipvlan/ipvlan.go | 10 +++++----- plugins/main/loopback/loopback.go | 6 +++--- plugins/main/loopback/loopback_suite_test.go | 2 +- plugins/main/loopback/loopback_test.go | 4 ++-- plugins/main/macvlan/macvlan.go | 12 ++++++------ plugins/main/ptp/ptp.go | 12 ++++++------ plugins/meta/flannel/flannel.go | 6 +++--- plugins/meta/tuning/tuning.go | 6 +++--- 34 files changed, 76 insertions(+), 76 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c17c687b..c056968c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,9 +14,9 @@ contribution. See the [DCO](DCO) file for details. # Email and Chat -The project uses the the cni-dev email list and #appc on Freenode for chat: +The project uses the the cni-dev email list and IRC chat: - Email: [cni-dev](https://groups.google.com/forum/#!forum/cni-dev) -- IRC: #[appc](irc://irc.freenode.org:6667/#appc) IRC channel on freenode.org +- IRC: #[containernetworking](irc://irc.freenode.org:6667/#containernetworking) channel on freenode.org Please avoid emailing maintainers found in the MAINTAINERS file directly. They are very busy and read the mailing lists. diff --git a/Documentation/dhcp.md b/Documentation/dhcp.md index 298e96e0..7451c2c8 100644 --- a/Documentation/dhcp.md +++ b/Documentation/dhcp.md @@ -3,7 +3,7 @@ ## Overview With dhcp plugin the containers can get an IP allocated by a DHCP server already running on your network. -This can be especially useful with plugin types such as [macvlan](https://github.com/appc/cni/blob/master/Documentation/macvlan.md). +This can be especially useful with plugin types such as [macvlan](https://github.com/containernetworking/cni/blob/master/Documentation/macvlan.md). Because a DHCP lease must be periodically renewed for the duration of container lifetime, a separate daemon is required to be running. The same plugin binary can also be run in the daemon mode. diff --git a/Documentation/host-local.md b/Documentation/host-local.md index 35aba355..37446157 100644 --- a/Documentation/host-local.md +++ b/Documentation/host-local.md @@ -32,7 +32,7 @@ It stores the state locally on the host filesystem, therefore ensuring uniquenes * `routes` (string, optional): list of routes to add to the container namespace. Each route is a dictionary with "dst" and optional "gw" fields. If "gw" is omitted, value of "gateway" will be used. ## Supported arguments -The following [CNI_ARGS](https://github.com/appc/cni/blob/master/SPEC.md#parameters) are supported: +The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/SPEC.md#parameters) are supported: * `ip`: request a specific IP address from the subnet. If it's not available, the plugin will exit with an error diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index d0ace65d..e362e06a 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/appc/cni", + "ImportPath": "github.com/containernetworking/cni", "GoVersion": "go1.6", "Packages": [ "./..." diff --git a/README.md b/README.md index c96526f3..37d1cbf9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -[![Build Status](https://travis-ci.org/appc/cni.svg?branch=master)](https://travis-ci.org/appc/cni) -[![Coverage Status](https://coveralls.io/repos/github/appc/cni/badge.svg?branch=master)](https://coveralls.io/github/appc/cni?branch=master) +[![Build Status](https://travis-ci.org/containernetworking/cni.svg?branch=master)](https://travis-ci.org/containernetworking/cni) +[![Coverage Status](https://coveralls.io/repos/github/containernetworking/cni/badge.svg?branch=master)](https://coveralls.io/github/containernetworking/cni?branch=master) # CNI - the Container Network Interface @@ -34,7 +34,7 @@ Hence we are proposing this specification, along with an initial set of plugins ## Contributing to CNI -We welcome contributions, including [bug reports](https://github.com/appc/cni/issues), and code and documentation improvements. +We welcome contributions, including [bug reports](https://github.com/containernetworking/cni/issues), and code and documentation improvements. If you intend to contribute to code or documentation, please read [CONTRIBUTING.md](CONTRIBUTING.md). Also see the [contact section](#contact) in this README. ## How do I use CNI? @@ -156,6 +156,6 @@ If these topics of are interest please contact the team via the mailing list or ## Contact -For any questions about CNI, please reach out on the mailing list or IRC: +For any questions about CNI, please reach out on the mailing list: - Email: [cni-dev](https://groups.google.com/forum/#!forum/cni-dev) -- IRC: #[appc](irc://irc.freenode.org:6667/#appc) IRC channel on freenode.org +- IRC: #[containernetworking](irc://irc.freenode.org:6667/#containernetworking) channel on freenode.org diff --git a/build b/build index 815b360d..2acc8f27 100755 --- a/build +++ b/build @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -ORG_PATH="github.com/appc" +ORG_PATH="github.com/containernetworking" REPO_PATH="${ORG_PATH}/cni" if [ ! -h gopath/src/${REPO_PATH} ]; then diff --git a/cnitool/cni.go b/cnitool/cni.go index 62ac6759..91255c7f 100644 --- a/cnitool/cni.go +++ b/cnitool/cni.go @@ -20,7 +20,7 @@ import ( "path/filepath" "strings" - "github.com/appc/cni/libcni" + "github.com/containernetworking/cni/libcni" ) const ( diff --git a/libcni/api.go b/libcni/api.go index 77ca5d22..340a20cc 100644 --- a/libcni/api.go +++ b/libcni/api.go @@ -17,8 +17,8 @@ package libcni import ( "strings" - "github.com/appc/cni/pkg/invoke" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/types" ) type RuntimeConf struct { diff --git a/pkg/invoke/delegate.go b/pkg/invoke/delegate.go index 0a8198c3..ddf1d172 100644 --- a/pkg/invoke/delegate.go +++ b/pkg/invoke/delegate.go @@ -19,7 +19,7 @@ import ( "os" "strings" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) func DelegateAdd(delegatePlugin string, netconf []byte) (*types.Result, error) { diff --git a/pkg/invoke/exec.go b/pkg/invoke/exec.go index 337bfcb8..a85eede6 100644 --- a/pkg/invoke/exec.go +++ b/pkg/invoke/exec.go @@ -21,7 +21,7 @@ import ( "os" "os/exec" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) func pluginErr(err error, output []byte) error { diff --git a/pkg/invoke/find_test.go b/pkg/invoke/find_test.go index 4135538d..be4cc2dd 100644 --- a/pkg/invoke/find_test.go +++ b/pkg/invoke/find_test.go @@ -19,7 +19,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/appc/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/invoke" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/ip/link.go b/pkg/ip/link.go index 1ba529da..df168124 100644 --- a/pkg/ip/link.go +++ b/pkg/ip/link.go @@ -20,7 +20,7 @@ import ( "net" "os" - "github.com/appc/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/ns" "github.com/vishvananda/netlink" ) diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go index f0adfb7f..d9fbff74 100644 --- a/pkg/ipam/ipam.go +++ b/pkg/ipam/ipam.go @@ -18,9 +18,9 @@ import ( "fmt" "os" - "github.com/appc/cni/pkg/invoke" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/types" "github.com/vishvananda/netlink" ) diff --git a/pkg/ns/ns_test.go b/pkg/ns/ns_test.go index 7ad882f5..a901eb35 100644 --- a/pkg/ns/ns_test.go +++ b/pkg/ns/ns_test.go @@ -22,8 +22,8 @@ import ( "os/exec" "path/filepath" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/testhelpers" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/testhelpers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/skel/skel.go b/pkg/skel/skel.go index 5c3532db..7347b078 100644 --- a/pkg/skel/skel.go +++ b/pkg/skel/skel.go @@ -22,7 +22,7 @@ import ( "log" "os" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) // CmdArgs captures all the arguments passed in to the plugin diff --git a/pkg/testhelpers/testhelpers_test.go b/pkg/testhelpers/testhelpers_test.go index ce328f01..62d45856 100644 --- a/pkg/testhelpers/testhelpers_test.go +++ b/pkg/testhelpers/testhelpers_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/sys/unix" - "github.com/appc/cni/pkg/testhelpers" + "github.com/containernetworking/cni/pkg/testhelpers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" ) diff --git a/pkg/types/args_test.go b/pkg/types/args_test.go index 23aaf817..61fd2233 100644 --- a/pkg/types/args_test.go +++ b/pkg/types/args_test.go @@ -17,7 +17,7 @@ package types_test import ( "reflect" - . "github.com/appc/cni/pkg/types" + . "github.com/containernetworking/cni/pkg/types" . "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo/extensions/table" diff --git a/plugins/ipam/dhcp/daemon.go b/plugins/ipam/dhcp/daemon.go index dabedf72..2386f9a9 100644 --- a/plugins/ipam/dhcp/daemon.go +++ b/plugins/ipam/dhcp/daemon.go @@ -27,8 +27,8 @@ import ( "runtime" "sync" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" "github.com/coreos/go-systemd/activation" ) diff --git a/plugins/ipam/dhcp/lease.go b/plugins/ipam/dhcp/lease.go index 90c223c7..82e2fc60 100644 --- a/plugins/ipam/dhcp/lease.go +++ b/plugins/ipam/dhcp/lease.go @@ -27,8 +27,8 @@ import ( "github.com/d2g/dhcp4client" "github.com/vishvananda/netlink" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/types" ) // RFC 2131 suggests using exponential backoff, starting with 4sec diff --git a/plugins/ipam/dhcp/main.go b/plugins/ipam/dhcp/main.go index da44d576..b5378315 100644 --- a/plugins/ipam/dhcp/main.go +++ b/plugins/ipam/dhcp/main.go @@ -20,8 +20,8 @@ import ( "os" "path/filepath" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" ) const socketPath = "/run/cni/dhcp.sock" diff --git a/plugins/ipam/dhcp/options.go b/plugins/ipam/dhcp/options.go index f2712c28..b11ec21d 100644 --- a/plugins/ipam/dhcp/options.go +++ b/plugins/ipam/dhcp/options.go @@ -20,7 +20,7 @@ import ( "net" "time" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" "github.com/d2g/dhcp4" ) diff --git a/plugins/ipam/dhcp/options_test.go b/plugins/ipam/dhcp/options_test.go index 0a140cef..f69ae7bc 100644 --- a/plugins/ipam/dhcp/options_test.go +++ b/plugins/ipam/dhcp/options_test.go @@ -18,7 +18,7 @@ import ( "net" "testing" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" "github.com/d2g/dhcp4" ) diff --git a/plugins/ipam/host-local/allocator.go b/plugins/ipam/host-local/allocator.go index 2b867ce5..55a3ae6f 100644 --- a/plugins/ipam/host-local/allocator.go +++ b/plugins/ipam/host-local/allocator.go @@ -18,9 +18,9 @@ import ( "fmt" "net" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/types" - "github.com/appc/cni/plugins/ipam/host-local/backend" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/types" + "github.com/containernetworking/cni/plugins/ipam/host-local/backend" ) type IPAllocator struct { diff --git a/plugins/ipam/host-local/config.go b/plugins/ipam/host-local/config.go index 08ca07e3..a0e493cd 100644 --- a/plugins/ipam/host-local/config.go +++ b/plugins/ipam/host-local/config.go @@ -19,7 +19,7 @@ import ( "fmt" "net" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/types" ) // IPAMConfig represents the IP related network configuration. diff --git a/plugins/ipam/host-local/main.go b/plugins/ipam/host-local/main.go index 9f67e8a5..d2f3c305 100644 --- a/plugins/ipam/host-local/main.go +++ b/plugins/ipam/host-local/main.go @@ -15,10 +15,10 @@ package main import ( - "github.com/appc/cni/plugins/ipam/host-local/backend/disk" + "github.com/containernetworking/cni/plugins/ipam/host-local/backend/disk" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" ) func main() { diff --git a/plugins/main/bridge/bridge.go b/plugins/main/bridge/bridge.go index cc363a41..3c058e1a 100644 --- a/plugins/main/bridge/bridge.go +++ b/plugins/main/bridge/bridge.go @@ -23,12 +23,12 @@ import ( "runtime" "syscall" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/ipam" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" - "github.com/appc/cni/pkg/utils" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/ipam" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" + "github.com/containernetworking/cni/pkg/utils" "github.com/vishvananda/netlink" ) diff --git a/plugins/main/ipvlan/ipvlan.go b/plugins/main/ipvlan/ipvlan.go index 85919772..6de0cb9e 100644 --- a/plugins/main/ipvlan/ipvlan.go +++ b/plugins/main/ipvlan/ipvlan.go @@ -21,11 +21,11 @@ import ( "os" "runtime" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/ipam" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/ipam" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" "github.com/vishvananda/netlink" ) diff --git a/plugins/main/loopback/loopback.go b/plugins/main/loopback/loopback.go index dabe8078..1e5095d0 100644 --- a/plugins/main/loopback/loopback.go +++ b/plugins/main/loopback/loopback.go @@ -17,9 +17,9 @@ package main import ( "os" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" "github.com/vishvananda/netlink" ) diff --git a/plugins/main/loopback/loopback_suite_test.go b/plugins/main/loopback/loopback_suite_test.go index be179aa8..e3557479 100644 --- a/plugins/main/loopback/loopback_suite_test.go +++ b/plugins/main/loopback/loopback_suite_test.go @@ -32,7 +32,7 @@ func TestLoopback(t *testing.T) { var _ = BeforeSuite(func() { var err error - pathToLoPlugin, err = gexec.Build("github.com/appc/cni/plugins/main/loopback") + pathToLoPlugin, err = gexec.Build("github.com/containernetworking/cni/plugins/main/loopback") Expect(err).NotTo(HaveOccurred()) }) diff --git a/plugins/main/loopback/loopback_test.go b/plugins/main/loopback/loopback_test.go index 037fbfeb..7c009d1d 100644 --- a/plugins/main/loopback/loopback_test.go +++ b/plugins/main/loopback/loopback_test.go @@ -21,8 +21,8 @@ import ( "os/exec" "strings" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/testhelpers" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/testhelpers" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "github.com/onsi/gomega/gbytes" diff --git a/plugins/main/macvlan/macvlan.go b/plugins/main/macvlan/macvlan.go index 0635f263..febf2fc0 100644 --- a/plugins/main/macvlan/macvlan.go +++ b/plugins/main/macvlan/macvlan.go @@ -21,12 +21,12 @@ import ( "os" "runtime" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/ipam" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" - "github.com/appc/cni/pkg/utils/sysctl" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/ipam" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" + "github.com/containernetworking/cni/pkg/utils/sysctl" "github.com/vishvananda/netlink" ) diff --git a/plugins/main/ptp/ptp.go b/plugins/main/ptp/ptp.go index 3035c643..2cd5185a 100644 --- a/plugins/main/ptp/ptp.go +++ b/plugins/main/ptp/ptp.go @@ -24,12 +24,12 @@ import ( "github.com/vishvananda/netlink" - "github.com/appc/cni/pkg/ip" - "github.com/appc/cni/pkg/ipam" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" - "github.com/appc/cni/pkg/utils" + "github.com/containernetworking/cni/pkg/ip" + "github.com/containernetworking/cni/pkg/ipam" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" + "github.com/containernetworking/cni/pkg/utils" ) func init() { diff --git a/plugins/meta/flannel/flannel.go b/plugins/meta/flannel/flannel.go index 6653baca..096fe6d6 100644 --- a/plugins/meta/flannel/flannel.go +++ b/plugins/meta/flannel/flannel.go @@ -29,9 +29,9 @@ import ( "strconv" "strings" - "github.com/appc/cni/pkg/invoke" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/invoke" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" ) const ( diff --git a/plugins/meta/tuning/tuning.go b/plugins/meta/tuning/tuning.go index 91118dfb..f48d3226 100644 --- a/plugins/meta/tuning/tuning.go +++ b/plugins/meta/tuning/tuning.go @@ -25,9 +25,9 @@ import ( "path/filepath" "strings" - "github.com/appc/cni/pkg/ns" - "github.com/appc/cni/pkg/skel" - "github.com/appc/cni/pkg/types" + "github.com/containernetworking/cni/pkg/ns" + "github.com/containernetworking/cni/pkg/skel" + "github.com/containernetworking/cni/pkg/types" ) // TuningConf represents the network tuning configuration.