diff --git a/README.md b/README.md index f45bbf809..0f788d9e1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # Multus-CNI -![multus-cni Logo](https://github.com/intel/multus-cni/blob/master/docs/images/Multus.png) +![multus-cni Logo](https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/images/Multus.png) -[![Build](https://github.com/intel/multus-cni/actions/workflows/build.yml/badge.svg)](https://github.com/intel/multus-cni/actions/workflows/build.yml)[![Test](https://github.com/intel/multus-cni/actions/workflows/test.yml/badge.svg)](https://github.com/intel/multus-cni/actions/workflows/test.yml)[![Go Report Card](https://goreportcard.com/badge/github.com/intel/multus-cni)](https://goreportcard.com/report/github.com/intel/multus-cni)[![Coverage Status](https://coveralls.io/repos/github/intel/multus-cni/badge.svg)](https://coveralls.io/github/intel/multus-cni) +[![Build](https://github.com/k8snetworkplumbingwg/multus-cni/actions/workflows/build.yml/badge.svg)](https://github.com/k8snetworkplumbingwg/multus-cni/actions/workflows/build.yml)[![Test](https://github.com/k8snetworkplumbingwg/multus-cni/actions/workflows/test.yml/badge.svg)](https://github.com/k8snetworkplumbingwg/multus-cni/actions/workflows/test.yml)[![Go Report Card](https://goreportcard.com/badge/github.com/k8snetworkplumbingwg/multus-cni)](https://goreportcard.com/report/github.com/k8snetworkplumbingwg/multus-cni)[![Coverage Status](https://coveralls.io/repos/github/k8snetworkplumbingwg/multus-cni/badge.svg)](https://coveralls.io/github/k8snetworkplumbingwg/multus-cni) Multus CNI enables attaching multiple network interfaces to pods in Kubernetes. @@ -35,7 +35,7 @@ This will configure your systems to be ready to use Multus CNI, but, to get star ## Additional installation Options - Install via daemonset using the quick-start guide, above. -- Download binaries from [release page](https://github.com/intel/multus-cni/releases) +- Download binaries from [release page](https://github.com/k8snetworkplumbingwg/multus-cni/releases) - By Docker image from [Docker Hub](https://hub.docker.com/r/nfvpe/multus/tags/) - Or, roll-your-own and build from source - See [Development](docs/development.md) diff --git a/cmd/main.go b/cmd/main.go index 96a2edbb0..732f26f96 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,7 +25,7 @@ import ( "github.com/containernetworking/cni/pkg/skel" cniversion "github.com/containernetworking/cni/pkg/version" - "gopkg.in/intel/multus-cni.v3/pkg/multus" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/multus" ) func main() { diff --git a/docs/configuration.md b/docs/configuration.md index 0fbb91508..fd3418fce 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -39,12 +39,12 @@ Following is the example of multus config file, in `/etc/cni/net.d/`. * `confDir` (string, optional): directory for CNI config file that multus reads. default `/etc/cni/multus/net.d` * `cniDir` (string, optional): Multus CNI data directory, default `/var/lib/cni/multus` * `binDir` (string, optional): additional directory for CNI plugins which multus calls, in addition to the default (the default is typically set to `/opt/cni/bin`) -* `kubeconfig` (string, optional): kubeconfig file for the out of cluster communication with kube-apiserver. See the example [kubeconfig](https://github.com/intel/multus-cni/blob/master/doc/node-kubeconfig.yaml). If you would like to use CRD (i.e. network attachment definition), this is required +* `kubeconfig` (string, optional): kubeconfig file for the out of cluster communication with kube-apiserver. See the example [kubeconfig](https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/node-kubeconfig.yaml). If you would like to use CRD (i.e. network attachment definition), this is required * `logToStderr` (bool, optional): Enable or disable logging to `STDERR`. Defaults to true. * `logFile` (string, optional): file path for log file. multus puts log in given file * `logLevel` (string, optional): logging level ("debug", "error", "verbose", or "panic") * `namespaceIsolation` (boolean, optional): Enables a security feature where pods are only allowed to access `NetworkAttachmentDefinitions` in the namespace where the pod resides. Defaults to false. -* `capabilities` ({}list, optional): [capabilities](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#dynamic-plugin-specific-fields-capabilities--runtime-configuration) supported by at least one of the delegates. (NOTE: Multus only supports portMappings capability for now). See the [example](https://github.com/intel/multus-cni/blob/master/examples/multus-ptp-portmap.conf). +* `capabilities` ({}list, optional): [capabilities](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#dynamic-plugin-specific-fields-capabilities--runtime-configuration) supported by at least one of the delegates. (NOTE: Multus only supports portMappings/Bandwidth capability for cluster networks). * `readinessindicatorfile`: The path to a file whose existance denotes that the default network is ready User should chose following parameters combination (`clusterNetwork`+`defaultNetworks` or `delegates`): diff --git a/docs/development.md b/docs/development.md index da3c4527f..1972bb738 100644 --- a/docs/development.md +++ b/docs/development.md @@ -6,7 +6,7 @@ Multus now uses [gopkg.in](http://gopkg.in/) to expose its code as library. You can use following command to import our code into your go code. ``` -go get gopkg.in/intel/multus-cni.v3 +go get gopkg.in/k8snetworkplumbingwg/multus-cni.v3 ``` @@ -25,7 +25,7 @@ If an issue is closed that you don't feel is sufficiently resolved, please feel You can use the built in `./hack/build-go.sh` script! ``` -git clone https://github.com/intel/multus-cni.git +git clone https://github.com/k8snetworkplumbingwg/multus-cni.git cd multus-cni ./hack/build-go.sh ``` diff --git a/docs/how-to-use.md b/docs/how-to-use.md index 1456211b8..6bfa78a34 100644 --- a/docs/how-to-use.md +++ b/docs/how-to-use.md @@ -13,7 +13,7 @@ Generally we recommend two options: Manually place a Multus binary in your `/opt *Copy Multus Binary into place* -You may acquire the Multus binary via compilation (see the [developer guide](development.md)) or download the a binary from the [GitHub releases](https://github.com/intel/multus-cni/releases) page. Copy multus binary into CNI binary directory, usually `/opt/cni/bin`. Perform this on all nodes in your cluster (master and nodes). +You may acquire the Multus binary via compilation (see the [developer guide](development.md)) or download the a binary from the [GitHub releases](https://github.com/k8snetworkplumbingwg/multus-cni/releases) page. Copy multus binary into CNI binary directory, usually `/opt/cni/bin`. Perform this on all nodes in your cluster (master and nodes). $ cp multus /opt/cni/bin diff --git a/docs/quickstart.md b/docs/quickstart.md index b4ea70e0c..901506501 100644 --- a/docs/quickstart.md +++ b/docs/quickstart.md @@ -45,7 +45,7 @@ Our recommended quickstart method to deploy Multus is to deploy using a Daemonse Firstly, clone this GitHub repository. ``` -git clone https://github.com/intel/multus-cni.git && cd multus-cni +git clone https://github.com/k8snetworkplumbingwg/multus-cni.git && cd multus-cni ``` We'll apply a YAML file with `kubectl` from this repo. diff --git a/e2e/README.md b/e2e/README.md index a9897c3f5..1b948d746 100644 --- a/e2e/README.md +++ b/e2e/README.md @@ -4,7 +4,7 @@ ``` -$ git clone https://github.com/intel/multus-cni.git +$ git clone https://github.com/k8snetworkplumbingwg/multus-cni.git $ cd multus-cni/e2e $ ./get_tools.sh $ ./setup_cluster.sh diff --git a/go.mod b/go.mod index 24575d19b..9e269e9bf 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gopkg.in/intel/multus-cni.v3 +module gopkg.in/k8snetworkplumbingwg/multus-cni.v3 go 1.12 diff --git a/hack/build-go.sh b/hack/build-go.sh index df6aab34c..9a46371c4 100755 --- a/hack/build-go.sh +++ b/hack/build-go.sh @@ -29,7 +29,7 @@ if [ "$GO111MODULE" == "off" ]; then echo "Building plugin without go module" echo "Warning: this will be deprecated in near future so please use go modules!" - ORG_PATH="gopkg.in/intel" + ORG_PATH="gopkg.in/k8snetworkplumbingwg" REPO_PATH="${ORG_PATH}/multus-cni.v3" if [ ! -h gopath/src/${REPO_PATH} ]; then diff --git a/pkg/checkpoint/checkpoint.go b/pkg/checkpoint/checkpoint.go index 12cef7a18..ac43bb13c 100644 --- a/pkg/checkpoint/checkpoint.go +++ b/pkg/checkpoint/checkpoint.go @@ -19,8 +19,8 @@ import ( "encoding/json" "io/ioutil" - "gopkg.in/intel/multus-cni.v3/pkg/logging" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" v1 "k8s.io/api/core/v1" ) diff --git a/pkg/checkpoint/checkpoint_test.go b/pkg/checkpoint/checkpoint_test.go index 4964bd9b0..0f82e47ed 100644 --- a/pkg/checkpoint/checkpoint_test.go +++ b/pkg/checkpoint/checkpoint_test.go @@ -10,7 +10,7 @@ import ( "io/ioutil" "testing" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" k8sTypes "k8s.io/apimachinery/pkg/types" diff --git a/pkg/k8sclient/k8sclient.go b/pkg/k8sclient/k8sclient.go index dfd6ec3ae..7b48d8f5f 100644 --- a/pkg/k8sclient/k8sclient.go +++ b/pkg/k8sclient/k8sclient.go @@ -41,9 +41,9 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netclient "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/typed/k8s.cni.cncf.io/v1" netutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - "gopkg.in/intel/multus-cni.v3/pkg/kubeletclient" - "gopkg.in/intel/multus-cni.v3/pkg/logging" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/kubeletclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" ) const ( diff --git a/pkg/k8sclient/k8sclient_test.go b/pkg/k8sclient/k8sclient_test.go index 32aff2344..1fbfe2fec 100644 --- a/pkg/k8sclient/k8sclient_test.go +++ b/pkg/k8sclient/k8sclient_test.go @@ -23,10 +23,10 @@ import ( "testing" types020 "github.com/containernetworking/cni/pkg/types/020" - testutils "gopkg.in/intel/multus-cni.v3/pkg/testing" + testutils "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" "github.com/containernetworking/cni/pkg/skel" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" diff --git a/pkg/kubeletclient/kubeletclient.go b/pkg/kubeletclient/kubeletclient.go index 4e718c22a..f7200c611 100644 --- a/pkg/kubeletclient/kubeletclient.go +++ b/pkg/kubeletclient/kubeletclient.go @@ -6,9 +6,9 @@ import ( "time" "golang.org/x/net/context" - "gopkg.in/intel/multus-cni.v3/pkg/checkpoint" - "gopkg.in/intel/multus-cni.v3/pkg/logging" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/checkpoint" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" v1 "k8s.io/api/core/v1" "k8s.io/kubernetes/pkg/kubelet/apis/podresources" podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" diff --git a/pkg/kubeletclient/kubeletclient_test.go b/pkg/kubeletclient/kubeletclient_test.go index 8878034fe..b573f4624 100644 --- a/pkg/kubeletclient/kubeletclient_test.go +++ b/pkg/kubeletclient/kubeletclient_test.go @@ -15,7 +15,7 @@ import ( k8sTypes "k8s.io/apimachinery/pkg/types" "k8s.io/kubernetes/pkg/kubelet/util" - mtypes "gopkg.in/intel/multus-cni.v3/pkg/types" + mtypes "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1" ) diff --git a/pkg/multus/multus.go b/pkg/multus/multus.go index 48241cb0a..10a9ccc78 100644 --- a/pkg/multus/multus.go +++ b/pkg/multus/multus.go @@ -36,10 +36,10 @@ import ( nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" "github.com/vishvananda/netlink" - k8s "gopkg.in/intel/multus-cni.v3/pkg/k8sclient" - "gopkg.in/intel/multus-cni.v3/pkg/logging" - "gopkg.in/intel/multus-cni.v3/pkg/netutils" - "gopkg.in/intel/multus-cni.v3/pkg/types" + k8s "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/netutils" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/util/wait" @@ -379,7 +379,7 @@ func delegateAdd(exec invoke.Exec, kubeClient *k8s.ClientInfo, pod *v1.Pod, ifNa kubeClient.Eventf(pod, v1.EventTypeNormal, "AddedInterface", "Add %s %v", rt.IfName, ips) } } else { - // for further debug https://github.com/intel/multus-cni/issues/481 + // for further debug https://github.com/k8snetworkplumbingwg/multus-cni/issues/481 logging.Errorf("delegateAdd: pod nil pointer: namespace: %s, name: %s, container id: %s, pod: %v", rt.Args[1][1], rt.Args[2][1], rt.Args[3][1], pod) } diff --git a/pkg/multus/multus_test.go b/pkg/multus/multus_test.go index d42dafda8..6903d1a94 100644 --- a/pkg/multus/multus_test.go +++ b/pkg/multus/multus_test.go @@ -35,10 +35,10 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" netfake "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/client/clientset/versioned/fake" - "gopkg.in/intel/multus-cni.v3/pkg/k8sclient" - "gopkg.in/intel/multus-cni.v3/pkg/logging" - testhelpers "gopkg.in/intel/multus-cni.v3/pkg/testing" - "gopkg.in/intel/multus-cni.v3/pkg/types" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/k8sclient" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/types" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes/fake" diff --git a/pkg/netutils/netutils.go b/pkg/netutils/netutils.go index 2a92e9bf5..f7f769be0 100644 --- a/pkg/netutils/netutils.go +++ b/pkg/netutils/netutils.go @@ -21,7 +21,7 @@ import ( "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/plugins/pkg/ns" "github.com/vishvananda/netlink" - "gopkg.in/intel/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" "net" "strings" ) diff --git a/pkg/types/conf.go b/pkg/types/conf.go index 2b446d977..dc8b6f356 100644 --- a/pkg/types/conf.go +++ b/pkg/types/conf.go @@ -26,7 +26,7 @@ import ( "github.com/containernetworking/cni/pkg/types/current" "github.com/containernetworking/cni/pkg/version" nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - "gopkg.in/intel/multus-cni.v3/pkg/logging" + "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/logging" ) const ( diff --git a/pkg/types/conf_test.go b/pkg/types/conf_test.go index 3101d8d47..f69b2b375 100644 --- a/pkg/types/conf_test.go +++ b/pkg/types/conf_test.go @@ -27,7 +27,7 @@ import ( "github.com/containernetworking/plugins/pkg/ns" "github.com/containernetworking/plugins/pkg/testutils" netutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils" - testhelpers "gopkg.in/intel/multus-cni.v3/pkg/testing" + testhelpers "gopkg.in/k8snetworkplumbingwg/multus-cni.v3/pkg/testing" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega"