In order to de-couple commonly used code that is Linux specific

from packages that might be used in non-Linux contexts, the sub-package, "connector", has been moved from the "endpoint" package to the "datapath" package. Signed-off-by: Nate Sweet <nathanjsweet@pm.me>
cilium · Apr 7, 2020 · a889a3a · a889a3a
1 parent 0638987
commit a889a3a
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 5 deletions.
diff --git a/cilium-health/launch/endpoint.go b/cilium-health/launch/endpoint.go
@@ -25,10 +25,10 @@ import (
 	"time"
 
 	"github.com/cilium/cilium/api/v1/models"
+	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/datapath/linux/route"
 	"github.com/cilium/cilium/pkg/defaults"
 	"github.com/cilium/cilium/pkg/endpoint"
-	"github.com/cilium/cilium/pkg/endpoint/connector"
 	"github.com/cilium/cilium/pkg/endpoint/regeneration"
 	healthDefaults "github.com/cilium/cilium/pkg/health/defaults"
 	"github.com/cilium/cilium/pkg/health/probe"

diff --git a/daemon/cmd/state.go b/daemon/cmd/state.go
@@ -24,8 +24,8 @@ import (
 
 	"github.com/cilium/cilium/pkg/annotation"
 	"github.com/cilium/cilium/pkg/controller"
+	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/endpoint"
-	"github.com/cilium/cilium/pkg/endpoint/connector"
 	"github.com/cilium/cilium/pkg/k8s"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/logging/logfields"

diff --git a/pkg/endpoint/connector/add.go → pkg/datapath/connector/add.go b/pkg/endpoint/connector/add.go → pkg/datapath/connector/add.go
diff --git a/pkg/endpoint/connector/doc.go → pkg/datapath/connector/doc.go b/pkg/endpoint/connector/doc.go → pkg/datapath/connector/doc.go
diff --git a/pkg/endpoint/connector/docker.go → pkg/datapath/connector/docker.go b/pkg/endpoint/connector/docker.go → pkg/datapath/connector/docker.go
diff --git a/pkg/endpoint/connector/ipam.go → pkg/datapath/connector/ipam.go b/pkg/endpoint/connector/ipam.go → pkg/datapath/connector/ipam.go
diff --git a/pkg/endpoint/connector/ipvlan.go → pkg/datapath/connector/ipvlan.go b/pkg/endpoint/connector/ipvlan.go → pkg/datapath/connector/ipvlan.go
diff --git a/pkg/endpoint/connector/veth.go → pkg/datapath/connector/veth.go b/pkg/endpoint/connector/veth.go → pkg/datapath/connector/veth.go
diff --git a/pkg/datapath/linux/datapath.go b/pkg/datapath/linux/datapath.go
@@ -16,9 +16,9 @@ package linux
 
 import (
 	"github.com/cilium/cilium/pkg/datapath"
+	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/datapath/linux/config"
 	"github.com/cilium/cilium/pkg/datapath/loader"
-	"github.com/cilium/cilium/pkg/endpoint/connector"
 	"github.com/cilium/cilium/pkg/logging/logfields"
 )
 

diff --git a/plugins/cilium-cni/cilium-cni.go b/plugins/cilium-cni/cilium-cni.go
@@ -25,9 +25,9 @@ import (
 	"github.com/cilium/cilium/api/v1/models"
 	"github.com/cilium/cilium/common/addressing"
 	"github.com/cilium/cilium/pkg/client"
+	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/datapath/linux/route"
 	"github.com/cilium/cilium/pkg/defaults"
-	"github.com/cilium/cilium/pkg/endpoint/connector"
 	endpointid "github.com/cilium/cilium/pkg/endpoint/id"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/logging"

diff --git a/plugins/cilium-docker/driver/driver.go b/plugins/cilium-docker/driver/driver.go
@@ -26,9 +26,9 @@ import (
 
 	"github.com/cilium/cilium/api/v1/models"
 	"github.com/cilium/cilium/pkg/client"
+	"github.com/cilium/cilium/pkg/datapath/connector"
 	"github.com/cilium/cilium/pkg/datapath/link"
 	"github.com/cilium/cilium/pkg/datapath/linux/route"
-	"github.com/cilium/cilium/pkg/endpoint/connector"
 	endpointIDPkg "github.com/cilium/cilium/pkg/endpoint/id"
 	"github.com/cilium/cilium/pkg/labels"
 	"github.com/cilium/cilium/pkg/lock"