From 27c98070e87bb34f02da108d04bcfe2f09070659 Mon Sep 17 00:00:00 2001 From: Martynas Pumputis Date: Tue, 1 May 2018 17:49:27 +0200 Subject: [PATCH] Move npc/ipset package to net/ipset It's going to be used by net/bridge.go. --- {npc => net}/ipset/ipset.go | 0 npc/analyser.go | 2 +- npc/controller.go | 2 +- npc/controller_test.go | 2 +- npc/namespace.go | 2 +- npc/selector.go | 2 +- prog/weave-npc/main.go | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename {npc => net}/ipset/ipset.go (100%) diff --git a/npc/ipset/ipset.go b/net/ipset/ipset.go similarity index 100% rename from npc/ipset/ipset.go rename to net/ipset/ipset.go diff --git a/npc/analyser.go b/npc/analyser.go index e73d37b8..01cdf5ee 100644 --- a/npc/analyser.go +++ b/npc/analyser.go @@ -8,7 +8,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" ) // analysePolicyLegacy is used to analyse extensions/v1beta1/NetworkPolicy (legacy) and diff --git a/npc/controller.go b/npc/controller.go index 304ca04a..6bd26b1e 100644 --- a/npc/controller.go +++ b/npc/controller.go @@ -9,7 +9,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" "github.com/weaveworks/weave/npc/iptables" ) diff --git a/npc/controller_test.go b/npc/controller_test.go index 6174849d..f7dd7fdb 100644 --- a/npc/controller_test.go +++ b/npc/controller_test.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" coreapi "k8s.io/api/core/v1" networkingv1 "k8s.io/api/networking/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/npc/namespace.go b/npc/namespace.go index 39cac4ca..5dc3f46e 100644 --- a/npc/namespace.go +++ b/npc/namespace.go @@ -13,7 +13,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" "github.com/weaveworks/weave/npc/iptables" ) diff --git a/npc/selector.go b/npc/selector.go index 35a53f28..2a40e185 100644 --- a/npc/selector.go +++ b/npc/selector.go @@ -6,7 +6,7 @@ import ( "k8s.io/apimachinery/pkg/types" "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" ) type selectorSpec struct { diff --git a/prog/weave-npc/main.go b/prog/weave-npc/main.go index 01b5266c..7ba90c2a 100644 --- a/prog/weave-npc/main.go +++ b/prog/weave-npc/main.go @@ -19,7 +19,7 @@ import ( "github.com/weaveworks/weave/common" "github.com/weaveworks/weave/npc" - "github.com/weaveworks/weave/npc/ipset" + "github.com/weaveworks/weave/net/ipset" "github.com/weaveworks/weave/npc/metrics" "github.com/weaveworks/weave/npc/ulogd" )