fix: move felix to self repo to remove bird license

kubeovn · Dec 3, 2020 · 7bbdc00 · 7bbdc00
1 parent 076587a
commit 7bbdc00
Show file tree

Hide file tree

Showing 26 changed files with 4,849 additions and 1,533 deletions.
diff --git a/go.mod b/go.mod
@@ -4,6 +4,7 @@ go 1.12
 
 require (
 	github.com/Mellanox/sriovnet v1.0.1
+	github.com/alauda/felix v3.6.6-0.20201203091904-2408da9f0710+incompatible
 	github.com/containernetworking/cni v0.8.0
 	github.com/containernetworking/plugins v0.8.6
 	github.com/coreos/go-iptables v0.4.5
@@ -28,7 +29,7 @@ require (
 	github.com/onsi/gomega v1.9.0
 	github.com/osrg/gobgp v0.0.0-20190401195721-805d02fdfbc5
 	github.com/parnurzeal/gorequest v0.2.15
-	github.com/projectcalico/felix v3.6.1+incompatible
+	github.com/projectcalico/felix v0.0.0-00010101000000-000000000000 // indirect
 	github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba // indirect
 	github.com/projectcalico/go-yaml v0.0.0-20161201183616-955bc3e451ef // indirect
 	github.com/projectcalico/go-yaml-wrapper v0.0.0-20161127220527-598e54215bee // indirect
@@ -50,6 +51,7 @@ require (
 )
 
 replace (
+	github.com/projectcalico/felix => github.com/alauda/felix v3.6.6-0.20201203093205-12a6f33baca3+incompatible
 	k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
 	sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.2.0-beta.4
 )
diff --git a/go.sum b/go.sum
@@ -21,6 +21,10 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw=
+github.com/alauda/felix v3.6.6-0.20201203091904-2408da9f0710+incompatible h1:GbbS190ntt8URCw9wMLVbzQsyHc4SLX9acB92YYfhbs=
+github.com/alauda/felix v3.6.6-0.20201203091904-2408da9f0710+incompatible/go.mod h1:NeFJ7/fvKQ8X9styGJvh7sHmZoUprV5ZKzE2Ey82BEA=
+github.com/alauda/felix v3.6.6-0.20201203093205-12a6f33baca3+incompatible h1:qdHzwVrIaYYKUqAPxS7qtpd9IsmMD5eZ0TGTHXAD8VA=
+github.com/alauda/felix v3.6.6-0.20201203093205-12a6f33baca3+incompatible/go.mod h1:NeFJ7/fvKQ8X9styGJvh7sHmZoUprV5ZKzE2Ey82BEA=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc h1:cAKDfWh5VpdgMhJosfJnn5/FoN2SRZ4p7fJNX58YPaU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf h1:qet1QNfXsQxTZqLG4oE62mJzwPIB8+Tee4RNCL9ulrY=
@@ -328,8 +332,6 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/projectcalico/felix v3.6.1+incompatible h1:5MZ74sn4ELALVQxAyDDbUW4H0TYIvtg2LqHa2oAJu6w=
-github.com/projectcalico/felix v3.6.1+incompatible/go.mod h1:sXkI80qPUY4Nyon/P0JUD7ziCjHTg6HI6rxczHG3AY8=
 github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba h1:aaF2byUCZhzszHsfPEr2M3qcU4ibtD/yk/il2R7T1PU=
 github.com/projectcalico/go-json v0.0.0-20161128004156-6219dc7339ba/go.mod h1:q8EdCgBdMQzgiX/uk4GXLWLk+gIHd1a7mWUAamJKDb4=
 github.com/projectcalico/go-yaml v0.0.0-20161201183616-955bc3e451ef h1:Di9BaA9apb6DEstin8RdhKmlzQG76UMbmjPzjCVkMpc=

diff --git a/pkg/daemon/controller.go b/pkg/daemon/controller.go
@@ -12,12 +12,12 @@ import (
 	"github.com/alauda/kube-ovn/pkg/ovs"
 	"k8s.io/apimachinery/pkg/api/errors"
 
+	"github.com/alauda/felix/ipsets"
 	kubeovnv1 "github.com/alauda/kube-ovn/pkg/apis/kubeovn/v1"
 	kubeovninformer "github.com/alauda/kube-ovn/pkg/client/informers/externalversions"
 	kubeovnlister "github.com/alauda/kube-ovn/pkg/client/listers/kubeovn/v1"
 	"github.com/alauda/kube-ovn/pkg/util"
 	"github.com/coreos/go-iptables/iptables"
-	"github.com/projectcalico/felix/ipsets"
 	"github.com/vishvananda/netlink"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/daemon/gateway.go b/pkg/daemon/gateway.go
@@ -6,10 +6,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/alauda/felix/ipsets"
 	kubeovnv1 "github.com/alauda/kube-ovn/pkg/apis/kubeovn/v1"
 	"github.com/alauda/kube-ovn/pkg/ovs"
 	"github.com/alauda/kube-ovn/pkg/util"
-	"github.com/projectcalico/felix/ipsets"
 	"github.com/vishvananda/netlink"
 	v1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"

diff --git a/...or/github.com/projectcalico/felix/LICENSE → vendor/github.com/alauda/felix/LICENSE b/...or/github.com/projectcalico/felix/LICENSE → vendor/github.com/alauda/felix/LICENSE
diff --git a/...om/projectcalico/felix/ipsets/cmd_shim.go → ...ithub.com/alauda/felix/ipsets/cmd_shim.go b/...om/projectcalico/felix/ipsets/cmd_shim.go → ...ithub.com/alauda/felix/ipsets/cmd_shim.go
diff --git a/.../projectcalico/felix/ipsets/ipset_defs.go → ...hub.com/alauda/felix/ipsets/ipset_defs.go b/.../projectcalico/felix/ipsets/ipset_defs.go → ...hub.com/alauda/felix/ipsets/ipset_defs.go
diff --git a/....com/projectcalico/felix/ipsets/ipsets.go → .../github.com/alauda/felix/ipsets/ipsets.go b/....com/projectcalico/felix/ipsets/ipsets.go → .../github.com/alauda/felix/ipsets/ipsets.go
diff --git a/vendor/github.com/pmezard/go-difflib/LICENSE b/vendor/github.com/pmezard/go-difflib/LICENSE