move NEG stuff into pkg

kubernetes · Oct 26, 2017 · 75a3563 · 75a3563
1 parent 64c563a
commit 75a3563
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 15 deletions.
diff --git a/cmd/glbc/main.go b/cmd/glbc/main.go
@@ -48,11 +48,10 @@ import (
 	"k8s.io/ingress-gce/pkg/context"
 	"k8s.io/ingress-gce/pkg/controller"
 	"k8s.io/ingress-gce/pkg/loadbalancers"
+	neg "k8s.io/ingress-gce/pkg/networkendpointgroup"
 	"k8s.io/ingress-gce/pkg/storage"
 	"k8s.io/ingress-gce/pkg/utils"
 
-	neg "k8s.io/ingress-gce/networkendpointgroup"
-
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
 )

diff --git a/pkg/backends/backends_test.go b/pkg/backends/backends_test.go
@@ -26,16 +26,15 @@ import (
 	compute "google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 	api_v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/apimachinery/pkg/types"
 
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/instances"
+	"k8s.io/ingress-gce/pkg/networkendpointgroup"
 	"k8s.io/ingress-gce/pkg/storage"
 	"k8s.io/ingress-gce/pkg/utils"
-
-	"k8s.io/ingress-gce/networkendpointgroup"
 )
 
 const defaultZone = "zone-a"

diff --git a/pkg/controller/fakes.go b/pkg/controller/fakes.go
@@ -26,9 +26,8 @@ import (
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/loadbalancers"
+	"k8s.io/ingress-gce/pkg/networkendpointgroup"
 	"k8s.io/ingress-gce/pkg/utils"
-
-	"k8s.io/ingress-gce/networkendpointgroup"
 )
 
 var (

diff --git a/pkg/loadbalancers/loadbalancers_test.go b/pkg/loadbalancers/loadbalancers_test.go
@@ -26,9 +26,8 @@ import (
 	"k8s.io/ingress-gce/pkg/backends"
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	"k8s.io/ingress-gce/pkg/instances"
+	"k8s.io/ingress-gce/pkg/networkendpointgroup"
 	"k8s.io/ingress-gce/pkg/utils"
-
-	"k8s.io/ingress-gce/networkendpointgroup"
 )
 
 const (

diff --git a/networkendpointgroup/controller.go → pkg/networkendpointgroup/controller.go b/networkendpointgroup/controller.go → pkg/networkendpointgroup/controller.go
diff --git a/networkendpointgroup/controller_test.go → pkg/networkendpointgroup/controller_test.go b/networkendpointgroup/controller_test.go → pkg/networkendpointgroup/controller_test.go
@@ -25,8 +25,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
-	"k8s.io/ingress-gce/context"
-	"k8s.io/ingress-gce/utils"
+	"k8s.io/ingress-gce/pkg/context"
+	"k8s.io/ingress-gce/pkg/utils"
 
 	"k8s.io/apimachinery/pkg/util/intstr"
 )

diff --git a/networkendpointgroup/fakes.go → pkg/networkendpointgroup/fakes.go b/networkendpointgroup/fakes.go → pkg/networkendpointgroup/fakes.go
diff --git a/networkendpointgroup/interfaces.go → pkg/networkendpointgroup/interfaces.go b/networkendpointgroup/interfaces.go → pkg/networkendpointgroup/interfaces.go
diff --git a/networkendpointgroup/manager.go → pkg/networkendpointgroup/manager.go b/networkendpointgroup/manager.go → pkg/networkendpointgroup/manager.go
diff --git a/networkendpointgroup/manager_test.go → pkg/networkendpointgroup/manager_test.go b/networkendpointgroup/manager_test.go → pkg/networkendpointgroup/manager_test.go
@@ -24,8 +24,8 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/ingress-gce/context"
-	"k8s.io/ingress-gce/utils"
+	"k8s.io/ingress-gce/pkg/context"
+	"k8s.io/ingress-gce/pkg/utils"
 	"testing"
 	"time"
 )

diff --git a/networkendpointgroup/syncer.go → pkg/networkendpointgroup/syncer.go b/networkendpointgroup/syncer.go → pkg/networkendpointgroup/syncer.go
diff --git a/networkendpointgroup/syncer_test.go → pkg/networkendpointgroup/syncer_test.go b/networkendpointgroup/syncer_test.go → pkg/networkendpointgroup/syncer_test.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/ingress-gce/utils"
+	"k8s.io/ingress-gce/pkg/context"
 	"reflect"
 	"testing"
 	"time"
@@ -22,7 +22,7 @@ const (
 
 func NewTestSyncer() *syncer {
 	kubeClient := fake.NewSimpleClientset()
-	context := utils.NewControllerContext(kubeClient, apiv1.NamespaceAll, 1*time.Second, true)
+	context := context.NewControllerContext(kubeClient, apiv1.NamespaceAll, 1*time.Second, true)
 	svcPort := servicePort{
 		namespace:  ServiceNamespace,
 		name:       ServiceName,