diff --git a/Makefile b/Makefile index 5554088e..603229b6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ NAME?=kube-router DEV_SUFFIX?=-git -LOCAL_PACKAGES?=app app/controllers app/options app/watchers +LOCAL_PACKAGES?=app app/controllers app/options app/watchers utils IMG_NAMESPACE?=cloudnativelabs GIT_COMMIT=$(shell git describe --tags --dirty) GIT_BRANCH?=$(shell git rev-parse --abbrev-ref HEAD) diff --git a/app/controllers/network_policy_controller.go b/app/controllers/network_policy_controller.go index 251dbc9a..6590bf0b 100644 --- a/app/controllers/network_policy_controller.go +++ b/app/controllers/network_policy_controller.go @@ -17,10 +17,10 @@ import ( "github.com/cloudnativelabs/kube-router/utils" "github.com/coreos/go-iptables/iptables" "github.com/golang/glog" - "k8s.io/client-go/kubernetes" api "k8s.io/api/core/v1" apiextensions "k8s.io/api/extensions/v1beta1" networking "k8s.io/api/networking/v1" + "k8s.io/client-go/kubernetes" ) // Network policy controller provides an ingress firewall for the pods as per the defined network policies. diff --git a/app/watchers/endpoints_watcher.go b/app/watchers/endpoints_watcher.go index 54d34459..1376b059 100644 --- a/app/watchers/endpoints_watcher.go +++ b/app/watchers/endpoints_watcher.go @@ -5,10 +5,10 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" - api "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/app/watchers/namespace_watcher.go b/app/watchers/namespace_watcher.go index a748fd0a..e7261163 100644 --- a/app/watchers/namespace_watcher.go +++ b/app/watchers/namespace_watcher.go @@ -5,12 +5,12 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" listers "k8s.io/client-go/listers/core/v1" - api "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/app/watchers/network_policy_watcher.go b/app/watchers/network_policy_watcher.go index 334ded09..550d3c78 100644 --- a/app/watchers/network_policy_watcher.go +++ b/app/watchers/network_policy_watcher.go @@ -7,11 +7,11 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + apiextensions "k8s.io/api/extensions/v1beta1" + networking "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" - apiextensions "k8s.io/api/extensions/v1beta1" - networking "k8s.io/api/networking/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/app/watchers/node_watcher.go b/app/watchers/node_watcher.go index 5797e4cc..5660716f 100644 --- a/app/watchers/node_watcher.go +++ b/app/watchers/node_watcher.go @@ -4,10 +4,10 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" - api "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/app/watchers/pods_watcher.go b/app/watchers/pods_watcher.go index ee46dd25..3e4c4b60 100644 --- a/app/watchers/pods_watcher.go +++ b/app/watchers/pods_watcher.go @@ -5,12 +5,12 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" listers "k8s.io/client-go/listers/core/v1" - api "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/app/watchers/services_watcher.go b/app/watchers/services_watcher.go index fccfd7d6..7a3e8951 100644 --- a/app/watchers/services_watcher.go +++ b/app/watchers/services_watcher.go @@ -5,10 +5,10 @@ import ( "time" "github.com/cloudnativelabs/kube-router/utils" + api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" "k8s.io/client-go/kubernetes" - api "k8s.io/api/core/v1" cache "k8s.io/client-go/tools/cache" ) diff --git a/utils/node.go b/utils/node.go index bd7aca21..2e7a7e96 100644 --- a/utils/node.go +++ b/utils/node.go @@ -6,9 +6,9 @@ import ( "net" "os" + apiv1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - apiv1 "k8s.io/api/core/v1" ) // GetNodeObject returns the node API object for the node