From 3c784c74acfea5083ac43ab9958bfe86119bc7ab Mon Sep 17 00:00:00 2001 From: Swaminathan Vasudevan Date: Tue, 5 May 2020 01:26:16 +0000 Subject: [PATCH] Move all 'common' code to 'pkg' This PR moves the common packages to the pkg folder. Fixes: #11293 Signed-off-by: Swaminathan Vasudevan --- Vagrantfile | 2 +- cilium/cmd/bpf_ct_flush.go | 2 +- cilium/cmd/bpf_ct_list.go | 2 +- cilium/cmd/bpf_ct_list_test.go | 2 +- cilium/cmd/bpf_endpoint_delete.go | 2 +- cilium/cmd/bpf_endpoint_list.go | 2 +- cilium/cmd/bpf_ipcache_get.go | 2 +- cilium/cmd/bpf_ipcache_list.go | 2 +- cilium/cmd/bpf_ipmasq_list.go | 2 +- cilium/cmd/bpf_lb_list.go | 2 +- cilium/cmd/bpf_metrics_list.go | 2 +- cilium/cmd/bpf_nat_flush.go | 2 +- cilium/cmd/bpf_nat_list.go | 2 +- cilium/cmd/bpf_nat_list_test.go | 2 +- cilium/cmd/bpf_policy_add.go | 2 +- cilium/cmd/bpf_policy_delete.go | 2 +- cilium/cmd/bpf_policy_get.go | 2 +- cilium/cmd/bpf_proxy_flush.go | 2 +- cilium/cmd/bpf_proxy_list.go | 2 +- cilium/cmd/bpf_sha_get.go | 2 +- cilium/cmd/bpf_sha_list.go | 2 +- cilium/cmd/bpf_tunnel_list.go | 2 +- cilium/cmd/cleanup.go | 2 +- daemon/cmd/daemon_main.go | 2 +- daemon/cmd/daemon_test.go | 2 +- daemon/cmd/policy_test.go | 2 +- {common => pkg}/addressing/ip.go | 0 {common => pkg}/addressing/ip_test.go | 0 pkg/bpf/endpoint.go | 2 +- {common => pkg/common}/build.sh | 0 {common => pkg/common}/const.go | 0 {common => pkg/common}/utils.go | 0 {common => pkg/common}/utils_test.go | 0 pkg/datapath/config.go | 2 +- pkg/datapath/loader/base.go | 2 +- pkg/datapath/loader/cache.go | 2 +- pkg/datapath/loader/template.go | 2 +- pkg/endpoint/api.go | 2 +- pkg/endpoint/bpf.go | 2 +- pkg/endpoint/cache.go | 2 +- pkg/endpoint/directory.go | 2 +- pkg/endpoint/endpoint.go | 2 +- pkg/endpoint/endpoint_test.go | 2 +- pkg/endpoint/policy.go | 2 +- pkg/endpoint/restore.go | 4 ++-- pkg/endpoint/restore_test.go | 2 +- pkg/endpointmanager/manager_test.go | 2 +- pkg/ipam/allocator_test.go | 2 +- pkg/ipam/ipam_test.go | 2 +- pkg/kvstore/backwards_compat.go | 2 +- pkg/maps/ctmap/ctmap_privileged_test.go | 2 +- pkg/maps/eventsmap/eventsmap.go | 2 +- pkg/maps/fragmap/fragmap.go | 2 +- pkg/maps/ipcache/ipcache.go | 2 +- pkg/maps/ipmasq/ipmasq.go | 2 +- pkg/maps/lbmap/affinity.go | 2 +- pkg/maps/lbmap/ipv4.go | 2 +- pkg/maps/lbmap/ipv6.go | 2 +- pkg/maps/lxcmap/lxcmap.go | 2 +- pkg/maps/metricsmap/metricsmap.go | 2 +- pkg/maps/nat/ipv4.go | 2 +- pkg/maps/nat/ipv6.go | 2 +- pkg/maps/neighborsmap/neighborsmap.go | 2 +- pkg/maps/signalmap/signalmap.go | 2 +- pkg/maps/sockmap/sockmap.go | 2 +- pkg/monitor/datapath_trace.go | 2 +- pkg/node/node_address.go | 2 +- pkg/option/config.go | 2 +- pkg/proxy/kafka_test.go | 2 +- pkg/testutils/endpoint.go | 2 +- pkg/tuple/ipv4.go | 2 +- pkg/tuple/ipv6.go | 2 +- {common => pkg}/types/ipv4.go | 0 {common => pkg}/types/ipv4_test.go | 0 {common => pkg}/types/ipv6.go | 0 {common => pkg}/types/ipv6_test.go | 0 {common => pkg}/types/macaddr.go | 0 {common => pkg}/types/macaddr_test.go | 0 plugins/cilium-cni/cilium-cni.go | 2 +- plugins/cilium-docker/main.go | 2 +- 80 files changed, 69 insertions(+), 69 deletions(-) rename {common => pkg}/addressing/ip.go (100%) rename {common => pkg}/addressing/ip_test.go (100%) rename {common => pkg/common}/build.sh (100%) rename {common => pkg/common}/const.go (100%) rename {common => pkg/common}/utils.go (100%) rename {common => pkg/common}/utils_test.go (100%) rename {common => pkg}/types/ipv4.go (100%) rename {common => pkg}/types/ipv4_test.go (100%) rename {common => pkg}/types/ipv6.go (100%) rename {common => pkg}/types/ipv6_test.go (100%) rename {common => pkg}/types/macaddr.go (100%) rename {common => pkg}/types/macaddr_test.go (100%) diff --git a/Vagrantfile b/Vagrantfile index de2293a0e11b..ef960ead3149 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -65,7 +65,7 @@ set -o pipefail export PATH=/home/vagrant/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games #{$makeclean} -~/go/src/github.com/cilium/cilium/common/build.sh +~/go/src/github.com/cilium/cilium/pkg/common/build.sh rm -fr ~/go/bin/cilium* SCRIPT diff --git a/cilium/cmd/bpf_ct_flush.go b/cilium/cmd/bpf_ct_flush.go index eaca9256bd40..434099beee6a 100644 --- a/cilium/cmd/bpf_ct_flush.go +++ b/cilium/cmd/bpf_ct_flush.go @@ -19,7 +19,7 @@ import ( "os" "strconv" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/ctmap" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_ct_list.go b/cilium/cmd/bpf_ct_list.go index b3fc08d57e67..7224c73cd248 100644 --- a/cilium/cmd/bpf_ct_list.go +++ b/cilium/cmd/bpf_ct_list.go @@ -19,9 +19,9 @@ import ( "os" "strconv" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/ctmap" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_ct_list_test.go b/cilium/cmd/bpf_ct_list_test.go index 990cee85d839..129926c205b4 100644 --- a/cilium/cmd/bpf_ct_list_test.go +++ b/cilium/cmd/bpf_ct_list_test.go @@ -23,12 +23,12 @@ import ( "os" "testing" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/checker" "github.com/cilium/cilium/pkg/command" "github.com/cilium/cilium/pkg/maps/ctmap" "github.com/cilium/cilium/pkg/tuple" + "github.com/cilium/cilium/pkg/types" . "gopkg.in/check.v1" ) diff --git a/cilium/cmd/bpf_endpoint_delete.go b/cilium/cmd/bpf_endpoint_delete.go index bb5249410143..3d28521f3d37 100644 --- a/cilium/cmd/bpf_endpoint_delete.go +++ b/cilium/cmd/bpf_endpoint_delete.go @@ -17,7 +17,7 @@ package cmd import ( "net" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/lxcmap" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_endpoint_list.go b/cilium/cmd/bpf_endpoint_list.go index 75bc04608833..40da24d19ddc 100644 --- a/cilium/cmd/bpf_endpoint_list.go +++ b/cilium/cmd/bpf_endpoint_list.go @@ -17,8 +17,8 @@ package cmd import ( "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/lxcmap" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_ipcache_get.go b/cilium/cmd/bpf_ipcache_get.go index 3093e6f69f5c..fb3a12c04be9 100644 --- a/cilium/cmd/bpf_ipcache_get.go +++ b/cilium/cmd/bpf_ipcache_get.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/ipcache" "github.com/hashicorp/go-immutable-radix" diff --git a/cilium/cmd/bpf_ipcache_list.go b/cilium/cmd/bpf_ipcache_list.go index 3e6ffe2c6d02..96b42247e9c4 100644 --- a/cilium/cmd/bpf_ipcache_list.go +++ b/cilium/cmd/bpf_ipcache_list.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/ipcache" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_ipmasq_list.go b/cilium/cmd/bpf_ipmasq_list.go index eab2664de0ed..47ff04778bd5 100644 --- a/cilium/cmd/bpf_ipmasq_list.go +++ b/cilium/cmd/bpf_ipmasq_list.go @@ -18,8 +18,8 @@ import ( "fmt" "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/ipmasq" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_lb_list.go b/cilium/cmd/bpf_lb_list.go index 4597be8780b4..4db9ad445286 100644 --- a/cilium/cmd/bpf_lb_list.go +++ b/cilium/cmd/bpf_lb_list.go @@ -17,9 +17,9 @@ package cmd import ( "fmt" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/loadbalancer" "github.com/cilium/cilium/pkg/maps/lbmap" diff --git a/cilium/cmd/bpf_metrics_list.go b/cilium/cmd/bpf_metrics_list.go index ec143749e896..7d73f49c77a1 100644 --- a/cilium/cmd/bpf_metrics_list.go +++ b/cilium/cmd/bpf_metrics_list.go @@ -22,8 +22,8 @@ import ( "strings" "text/tabwriter" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/metricsmap" monitorAPI "github.com/cilium/cilium/pkg/monitor/api" diff --git a/cilium/cmd/bpf_nat_flush.go b/cilium/cmd/bpf_nat_flush.go index a0a4e2111b87..1ebb6092d063 100644 --- a/cilium/cmd/bpf_nat_flush.go +++ b/cilium/cmd/bpf_nat_flush.go @@ -18,7 +18,7 @@ import ( "fmt" "os" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/nat" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_nat_list.go b/cilium/cmd/bpf_nat_list.go index 11d1be694cc7..8cea78112b70 100644 --- a/cilium/cmd/bpf_nat_list.go +++ b/cilium/cmd/bpf_nat_list.go @@ -18,9 +18,9 @@ import ( "fmt" "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/nat" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_nat_list_test.go b/cilium/cmd/bpf_nat_list_test.go index 55a2c94ce8ff..9bc30fdd6601 100644 --- a/cilium/cmd/bpf_nat_list_test.go +++ b/cilium/cmd/bpf_nat_list_test.go @@ -19,11 +19,11 @@ package cmd import ( "encoding/json" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/checker" "github.com/cilium/cilium/pkg/maps/nat" "github.com/cilium/cilium/pkg/tuple" + "github.com/cilium/cilium/pkg/types" . "gopkg.in/check.v1" ) diff --git a/cilium/cmd/bpf_policy_add.go b/cilium/cmd/bpf_policy_add.go index 3e89f9554382..2a1c5cc1c7b8 100644 --- a/cilium/cmd/bpf_policy_add.go +++ b/cilium/cmd/bpf_policy_add.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/spf13/cobra" ) diff --git a/cilium/cmd/bpf_policy_delete.go b/cilium/cmd/bpf_policy_delete.go index 0e20953a8eec..855ceb435b58 100644 --- a/cilium/cmd/bpf_policy_delete.go +++ b/cilium/cmd/bpf_policy_delete.go @@ -15,7 +15,7 @@ package cmd import ( - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/spf13/cobra" ) diff --git a/cilium/cmd/bpf_policy_get.go b/cilium/cmd/bpf_policy_get.go index 791311a87e77..6d414ba2ad69 100644 --- a/cilium/cmd/bpf_policy_get.go +++ b/cilium/cmd/bpf_policy_get.go @@ -24,10 +24,10 @@ import ( "text/tabwriter" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/identity" identitymodel "github.com/cilium/cilium/pkg/identity/model" "github.com/cilium/cilium/pkg/maps/policymap" diff --git a/cilium/cmd/bpf_proxy_flush.go b/cilium/cmd/bpf_proxy_flush.go index 65d665aa366e..2c09aa8931f4 100644 --- a/cilium/cmd/bpf_proxy_flush.go +++ b/cilium/cmd/bpf_proxy_flush.go @@ -17,7 +17,7 @@ package cmd import ( "fmt" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/spf13/cobra" ) diff --git a/cilium/cmd/bpf_proxy_list.go b/cilium/cmd/bpf_proxy_list.go index 9a04c8528553..fc0243215cc3 100644 --- a/cilium/cmd/bpf_proxy_list.go +++ b/cilium/cmd/bpf_proxy_list.go @@ -17,8 +17,8 @@ package cmd import ( "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/spf13/cobra" ) diff --git a/cilium/cmd/bpf_sha_get.go b/cilium/cmd/bpf_sha_get.go index 086a212dfa94..b5cd4e47f157 100644 --- a/cilium/cmd/bpf_sha_get.go +++ b/cilium/cmd/bpf_sha_get.go @@ -22,8 +22,8 @@ import ( "regexp" "strings" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/spf13/cobra" ) diff --git a/cilium/cmd/bpf_sha_list.go b/cilium/cmd/bpf_sha_list.go index cb002cfb9902..5742a1bf5d36 100644 --- a/cilium/cmd/bpf_sha_list.go +++ b/cilium/cmd/bpf_sha_list.go @@ -21,8 +21,8 @@ import ( "path/filepath" "strconv" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/defaults" "github.com/spf13/cobra" diff --git a/cilium/cmd/bpf_tunnel_list.go b/cilium/cmd/bpf_tunnel_list.go index c55aedbe5713..29f052f2cbb0 100644 --- a/cilium/cmd/bpf_tunnel_list.go +++ b/cilium/cmd/bpf_tunnel_list.go @@ -17,8 +17,8 @@ package cmd import ( "os" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/command" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/maps/tunnel" "github.com/spf13/cobra" diff --git a/cilium/cmd/cleanup.go b/cilium/cmd/cleanup.go index 30e87e40d301..3c1c2a1e685f 100644 --- a/cilium/cmd/cleanup.go +++ b/cilium/cmd/cleanup.go @@ -23,8 +23,8 @@ import ( "strconv" "strings" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/defaults" "github.com/cilium/cilium/pkg/maps/tunnel" "github.com/cilium/cilium/pkg/netns" diff --git a/daemon/cmd/daemon_main.go b/daemon/cmd/daemon_main.go index 4196cacb1caf..d99f90266834 100644 --- a/daemon/cmd/daemon_main.go +++ b/daemon/cmd/daemon_main.go @@ -29,10 +29,10 @@ import ( "github.com/cilium/cilium/api/v1/server" "github.com/cilium/cilium/api/v1/server/restapi" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/cgroups" "github.com/cilium/cilium/pkg/cleanup" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/components" "github.com/cilium/cilium/pkg/controller" "github.com/cilium/cilium/pkg/datapath/iptables" diff --git a/daemon/cmd/daemon_test.go b/daemon/cmd/daemon_test.go index 0e5c018014dd..70f589b213b0 100644 --- a/daemon/cmd/daemon_test.go +++ b/daemon/cmd/daemon_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/datapath" fakedatapath "github.com/cilium/cilium/pkg/datapath/fake" "github.com/cilium/cilium/pkg/endpoint" diff --git a/daemon/cmd/policy_test.go b/daemon/cmd/policy_test.go index ce6ceed76cfc..92b9d265f822 100644 --- a/daemon/cmd/policy_test.go +++ b/daemon/cmd/policy_test.go @@ -23,7 +23,7 @@ import ( "sort" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/checker" "github.com/cilium/cilium/pkg/endpoint" "github.com/cilium/cilium/pkg/endpoint/id" diff --git a/common/addressing/ip.go b/pkg/addressing/ip.go similarity index 100% rename from common/addressing/ip.go rename to pkg/addressing/ip.go diff --git a/common/addressing/ip_test.go b/pkg/addressing/ip_test.go similarity index 100% rename from common/addressing/ip_test.go rename to pkg/addressing/ip_test.go diff --git a/pkg/bpf/endpoint.go b/pkg/bpf/endpoint.go index a363dd4108a6..6d20491b80db 100644 --- a/pkg/bpf/endpoint.go +++ b/pkg/bpf/endpoint.go @@ -19,7 +19,7 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/types" + "github.com/cilium/cilium/pkg/types" ) // Must be in sync with ENDPOINT_KEY_* in diff --git a/common/build.sh b/pkg/common/build.sh similarity index 100% rename from common/build.sh rename to pkg/common/build.sh diff --git a/common/const.go b/pkg/common/const.go similarity index 100% rename from common/const.go rename to pkg/common/const.go diff --git a/common/utils.go b/pkg/common/utils.go similarity index 100% rename from common/utils.go rename to pkg/common/utils.go diff --git a/common/utils_test.go b/pkg/common/utils_test.go similarity index 100% rename from common/utils_test.go rename to pkg/common/utils_test.go diff --git a/pkg/datapath/config.go b/pkg/datapath/config.go index d96fd14cd8e5..57de14120666 100644 --- a/pkg/datapath/config.go +++ b/pkg/datapath/config.go @@ -17,7 +17,7 @@ package datapath import ( "io" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/identity" "github.com/cilium/cilium/pkg/mac" "github.com/cilium/cilium/pkg/option" diff --git a/pkg/datapath/loader/base.go b/pkg/datapath/loader/base.go index bed4b2d9f530..e4ce0ceef3d1 100644 --- a/pkg/datapath/loader/base.go +++ b/pkg/datapath/loader/base.go @@ -22,10 +22,10 @@ import ( "path/filepath" "strings" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/cgroups" "github.com/cilium/cilium/pkg/command/exec" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/datapath" "github.com/cilium/cilium/pkg/datapath/alignchecker" "github.com/cilium/cilium/pkg/datapath/prefilter" diff --git a/pkg/datapath/loader/cache.go b/pkg/datapath/loader/cache.go index 62e4cfc936fe..58ab2afcdb48 100644 --- a/pkg/datapath/loader/cache.go +++ b/pkg/datapath/loader/cache.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/controller" "github.com/cilium/cilium/pkg/datapath" "github.com/cilium/cilium/pkg/datapath/loader/metrics" diff --git a/pkg/datapath/loader/template.go b/pkg/datapath/loader/template.go index 0b55502e2e76..f39ae3073e8c 100644 --- a/pkg/datapath/loader/template.go +++ b/pkg/datapath/loader/template.go @@ -18,7 +18,7 @@ import ( "fmt" "reflect" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/datapath" diff --git a/pkg/endpoint/api.go b/pkg/endpoint/api.go index 6add3492c6bf..8c3a6605a169 100644 --- a/pkg/endpoint/api.go +++ b/pkg/endpoint/api.go @@ -23,7 +23,7 @@ import ( "sort" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/controller" "github.com/cilium/cilium/pkg/endpoint/regeneration" "github.com/cilium/cilium/pkg/fqdn" diff --git a/pkg/endpoint/bpf.go b/pkg/endpoint/bpf.go index 22106071d856..7d3c10ecac45 100644 --- a/pkg/endpoint/bpf.go +++ b/pkg/endpoint/bpf.go @@ -25,8 +25,8 @@ import ( "time" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/completion" "github.com/cilium/cilium/pkg/controller" "github.com/cilium/cilium/pkg/endpoint/regeneration" diff --git a/pkg/endpoint/cache.go b/pkg/endpoint/cache.go index 0251cae55622..c58adfe381e6 100644 --- a/pkg/endpoint/cache.go +++ b/pkg/endpoint/cache.go @@ -17,7 +17,7 @@ package endpoint import ( "fmt" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/identity" "github.com/cilium/cilium/pkg/mac" "github.com/cilium/cilium/pkg/option" diff --git a/pkg/endpoint/directory.go b/pkg/endpoint/directory.go index f3c15657b7ce..cf8b450d25fd 100644 --- a/pkg/endpoint/directory.go +++ b/pkg/endpoint/directory.go @@ -19,7 +19,7 @@ import ( "os" "path/filepath" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/logging/logfields" "github.com/cilium/cilium/pkg/option" diff --git a/pkg/endpoint/endpoint.go b/pkg/endpoint/endpoint.go index efe31ecfc6dc..3f4ce5889d26 100644 --- a/pkg/endpoint/endpoint.go +++ b/pkg/endpoint/endpoint.go @@ -28,7 +28,7 @@ import ( "unsafe" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/annotation" enirouting "github.com/cilium/cilium/pkg/aws/eni/routing" "github.com/cilium/cilium/pkg/bpf" diff --git a/pkg/endpoint/endpoint_test.go b/pkg/endpoint/endpoint_test.go index 72990171aa19..7eb790f5bac7 100644 --- a/pkg/endpoint/endpoint_test.go +++ b/pkg/endpoint/endpoint_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/datapath" "github.com/cilium/cilium/pkg/datapath/fake" "github.com/cilium/cilium/pkg/endpoint/id" diff --git a/pkg/endpoint/policy.go b/pkg/endpoint/policy.go index c3b522736cd8..002e22a38b37 100644 --- a/pkg/endpoint/policy.go +++ b/pkg/endpoint/policy.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/completion" "github.com/cilium/cilium/pkg/controller" endpointid "github.com/cilium/cilium/pkg/endpoint/id" diff --git a/pkg/endpoint/restore.go b/pkg/endpoint/restore.go index 9bcce7045916..c68eb539c605 100644 --- a/pkg/endpoint/restore.go +++ b/pkg/endpoint/restore.go @@ -24,8 +24,8 @@ import ( "time" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/endpoint/regeneration" "github.com/cilium/cilium/pkg/fqdn" "github.com/cilium/cilium/pkg/identity" diff --git a/pkg/endpoint/restore_test.go b/pkg/endpoint/restore_test.go index 6ed16ebc8c07..8682f820e463 100644 --- a/pkg/endpoint/restore_test.go +++ b/pkg/endpoint/restore_test.go @@ -26,7 +26,7 @@ import ( "path/filepath" "sort" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/checker" linuxDatapath "github.com/cilium/cilium/pkg/datapath/linux" "github.com/cilium/cilium/pkg/endpoint/regeneration" diff --git a/pkg/endpointmanager/manager_test.go b/pkg/endpointmanager/manager_test.go index 108b8c288934..cf6428ee5417 100644 --- a/pkg/endpointmanager/manager_test.go +++ b/pkg/endpointmanager/manager_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/checker" "github.com/cilium/cilium/pkg/completion" "github.com/cilium/cilium/pkg/datapath" diff --git a/pkg/ipam/allocator_test.go b/pkg/ipam/allocator_test.go index 18b02d1da6ac..fff1645c1bab 100644 --- a/pkg/ipam/allocator_test.go +++ b/pkg/ipam/allocator_test.go @@ -20,7 +20,7 @@ import ( "net" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/datapath/fake" . "gopkg.in/check.v1" diff --git a/pkg/ipam/ipam_test.go b/pkg/ipam/ipam_test.go index 32ed2dc172a9..529766fb8b91 100644 --- a/pkg/ipam/ipam_test.go +++ b/pkg/ipam/ipam_test.go @@ -20,7 +20,7 @@ import ( "net" "testing" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/checker" "github.com/cilium/cilium/pkg/cidr" "github.com/cilium/cilium/pkg/datapath" diff --git a/pkg/kvstore/backwards_compat.go b/pkg/kvstore/backwards_compat.go index 5787871f6ec4..2f20b0d0a43e 100644 --- a/pkg/kvstore/backwards_compat.go +++ b/pkg/kvstore/backwards_compat.go @@ -17,7 +17,7 @@ package kvstore import ( "context" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" ) // deleteLegacyPrefixes removes old kvstore prefixes of non-persistent keys diff --git a/pkg/maps/ctmap/ctmap_privileged_test.go b/pkg/maps/ctmap/ctmap_privileged_test.go index 41b7b1d72dfc..499bc4f2048a 100644 --- a/pkg/maps/ctmap/ctmap_privileged_test.go +++ b/pkg/maps/ctmap/ctmap_privileged_test.go @@ -20,9 +20,9 @@ import ( "testing" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/tuple" + "github.com/cilium/cilium/pkg/types" "github.com/cilium/cilium/pkg/u8proto" . "gopkg.in/check.v1" diff --git a/pkg/maps/eventsmap/eventsmap.go b/pkg/maps/eventsmap/eventsmap.go index 62e980cb3ff8..633bee338fb4 100644 --- a/pkg/maps/eventsmap/eventsmap.go +++ b/pkg/maps/eventsmap/eventsmap.go @@ -18,8 +18,8 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" ) diff --git a/pkg/maps/fragmap/fragmap.go b/pkg/maps/fragmap/fragmap.go index 8a4d63128c4b..d1a4054ed177 100644 --- a/pkg/maps/fragmap/fragmap.go +++ b/pkg/maps/fragmap/fragmap.go @@ -18,8 +18,8 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/types" ) const ( diff --git a/pkg/maps/ipcache/ipcache.go b/pkg/maps/ipcache/ipcache.go index 01eed481a4b1..bc006ca42d55 100644 --- a/pkg/maps/ipcache/ipcache.go +++ b/pkg/maps/ipcache/ipcache.go @@ -21,10 +21,10 @@ import ( "sync" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" + "github.com/cilium/cilium/pkg/types" "golang.org/x/sys/unix" ) diff --git a/pkg/maps/ipmasq/ipmasq.go b/pkg/maps/ipmasq/ipmasq.go index 1b0d714fecb4..86084a0379ae 100644 --- a/pkg/maps/ipmasq/ipmasq.go +++ b/pkg/maps/ipmasq/ipmasq.go @@ -19,8 +19,8 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/types" ) const ( diff --git a/pkg/maps/lbmap/affinity.go b/pkg/maps/lbmap/affinity.go index fcfe61c331b5..1d303c19d433 100644 --- a/pkg/maps/lbmap/affinity.go +++ b/pkg/maps/lbmap/affinity.go @@ -18,9 +18,9 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" + "github.com/cilium/cilium/pkg/types" ) const ( diff --git a/pkg/maps/lbmap/ipv4.go b/pkg/maps/lbmap/ipv4.go index 52077c6adce0..47131d98f154 100644 --- a/pkg/maps/lbmap/ipv4.go +++ b/pkg/maps/lbmap/ipv4.go @@ -19,10 +19,10 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/loadbalancer" + "github.com/cilium/cilium/pkg/types" "github.com/cilium/cilium/pkg/u8proto" ) diff --git a/pkg/maps/lbmap/ipv6.go b/pkg/maps/lbmap/ipv6.go index 0a11c7901050..10c1923f4909 100644 --- a/pkg/maps/lbmap/ipv6.go +++ b/pkg/maps/lbmap/ipv6.go @@ -19,10 +19,10 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/loadbalancer" + "github.com/cilium/cilium/pkg/types" "github.com/cilium/cilium/pkg/u8proto" ) diff --git a/pkg/maps/lxcmap/lxcmap.go b/pkg/maps/lxcmap/lxcmap.go index f08e3283a477..35e1beaea7d9 100644 --- a/pkg/maps/lxcmap/lxcmap.go +++ b/pkg/maps/lxcmap/lxcmap.go @@ -19,7 +19,7 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/mac" ) diff --git a/pkg/maps/metricsmap/metricsmap.go b/pkg/maps/metricsmap/metricsmap.go index ac33fbbbb98a..caee8787ea2e 100644 --- a/pkg/maps/metricsmap/metricsmap.go +++ b/pkg/maps/metricsmap/metricsmap.go @@ -20,8 +20,8 @@ import ( "strconv" "unsafe" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" "github.com/cilium/cilium/pkg/metrics" diff --git a/pkg/maps/nat/ipv4.go b/pkg/maps/nat/ipv4.go index a9a627d4388a..dd95c54c54c7 100644 --- a/pkg/maps/nat/ipv4.go +++ b/pkg/maps/nat/ipv4.go @@ -18,9 +18,9 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/tuple" + "github.com/cilium/cilium/pkg/types" ) // NatEntry4 represents an IPv4 entry in the NAT table. diff --git a/pkg/maps/nat/ipv6.go b/pkg/maps/nat/ipv6.go index 34fe92bab014..54b69dca4f40 100644 --- a/pkg/maps/nat/ipv6.go +++ b/pkg/maps/nat/ipv6.go @@ -18,9 +18,9 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/tuple" + "github.com/cilium/cilium/pkg/types" ) // NatEntry6 represents an IPv6 entry in the NAT table. diff --git a/pkg/maps/neighborsmap/neighborsmap.go b/pkg/maps/neighborsmap/neighborsmap.go index d335e67ef37c..685b8ac278d6 100644 --- a/pkg/maps/neighborsmap/neighborsmap.go +++ b/pkg/maps/neighborsmap/neighborsmap.go @@ -17,9 +17,9 @@ package neighborsmap import ( "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/option" + "github.com/cilium/cilium/pkg/types" ) const ( diff --git a/pkg/maps/signalmap/signalmap.go b/pkg/maps/signalmap/signalmap.go index 25f8a91b74b9..eec5e2a2e8a5 100644 --- a/pkg/maps/signalmap/signalmap.go +++ b/pkg/maps/signalmap/signalmap.go @@ -18,8 +18,8 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/bpf" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" ) diff --git a/pkg/maps/sockmap/sockmap.go b/pkg/maps/sockmap/sockmap.go index 35eec66adaf7..f6731d7fff0f 100644 --- a/pkg/maps/sockmap/sockmap.go +++ b/pkg/maps/sockmap/sockmap.go @@ -19,10 +19,10 @@ import ( "sync" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" + "github.com/cilium/cilium/pkg/types" ) // SockmapKey is the 5-tuple used to lookup a socket diff --git a/pkg/monitor/datapath_trace.go b/pkg/monitor/datapath_trace.go index a215d5f3bfb4..95d3c8d0a76a 100644 --- a/pkg/monitor/datapath_trace.go +++ b/pkg/monitor/datapath_trace.go @@ -22,9 +22,9 @@ import ( "net" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/monitor/api" + "github.com/cilium/cilium/pkg/types" ) const ( diff --git a/pkg/node/node_address.go b/pkg/node/node_address.go index 7586ffc5cb3f..981ce77ef9fe 100644 --- a/pkg/node/node_address.go +++ b/pkg/node/node_address.go @@ -23,9 +23,9 @@ import ( "strings" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/byteorder" "github.com/cilium/cilium/pkg/cidr" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/defaults" "github.com/cilium/cilium/pkg/logging/logfields" "github.com/cilium/cilium/pkg/option" diff --git a/pkg/option/config.go b/pkg/option/config.go index b1cd49fcf22f..511feb1878e9 100644 --- a/pkg/option/config.go +++ b/pkg/option/config.go @@ -29,9 +29,9 @@ import ( "time" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common" "github.com/cilium/cilium/pkg/cidr" clustermeshTypes "github.com/cilium/cilium/pkg/clustermesh/types" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/defaults" "github.com/cilium/cilium/pkg/ip" "github.com/cilium/cilium/pkg/lock" diff --git a/pkg/proxy/kafka_test.go b/pkg/proxy/kafka_test.go index f7d7eaeeea62..cafc24d87679 100644 --- a/pkg/proxy/kafka_test.go +++ b/pkg/proxy/kafka_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/completion" "github.com/cilium/cilium/pkg/datapath" "github.com/cilium/cilium/pkg/endpoint" diff --git a/pkg/testutils/endpoint.go b/pkg/testutils/endpoint.go index 323b133ad81b..5a48693808f1 100644 --- a/pkg/testutils/endpoint.go +++ b/pkg/testutils/endpoint.go @@ -15,7 +15,7 @@ package testutils import ( - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/identity" "github.com/cilium/cilium/pkg/labels" "github.com/cilium/cilium/pkg/mac" diff --git a/pkg/tuple/ipv4.go b/pkg/tuple/ipv4.go index e006e1486f19..0cf223907d9f 100644 --- a/pkg/tuple/ipv4.go +++ b/pkg/tuple/ipv4.go @@ -19,9 +19,9 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" + "github.com/cilium/cilium/pkg/types" "github.com/cilium/cilium/pkg/u8proto" ) diff --git a/pkg/tuple/ipv6.go b/pkg/tuple/ipv6.go index 9e2c080dd53f..67efcdc4dca8 100644 --- a/pkg/tuple/ipv6.go +++ b/pkg/tuple/ipv6.go @@ -19,9 +19,9 @@ import ( "fmt" "unsafe" - "github.com/cilium/cilium/common/types" "github.com/cilium/cilium/pkg/bpf" "github.com/cilium/cilium/pkg/byteorder" + "github.com/cilium/cilium/pkg/types" "github.com/cilium/cilium/pkg/u8proto" ) diff --git a/common/types/ipv4.go b/pkg/types/ipv4.go similarity index 100% rename from common/types/ipv4.go rename to pkg/types/ipv4.go diff --git a/common/types/ipv4_test.go b/pkg/types/ipv4_test.go similarity index 100% rename from common/types/ipv4_test.go rename to pkg/types/ipv4_test.go diff --git a/common/types/ipv6.go b/pkg/types/ipv6.go similarity index 100% rename from common/types/ipv6.go rename to pkg/types/ipv6.go diff --git a/common/types/ipv6_test.go b/pkg/types/ipv6_test.go similarity index 100% rename from common/types/ipv6_test.go rename to pkg/types/ipv6_test.go diff --git a/common/types/macaddr.go b/pkg/types/macaddr.go similarity index 100% rename from common/types/macaddr.go rename to pkg/types/macaddr.go diff --git a/common/types/macaddr_test.go b/pkg/types/macaddr_test.go similarity index 100% rename from common/types/macaddr_test.go rename to pkg/types/macaddr_test.go diff --git a/plugins/cilium-cni/cilium-cni.go b/plugins/cilium-cni/cilium-cni.go index 84b16a4c92de..eaf21c28727b 100644 --- a/plugins/cilium-cni/cilium-cni.go +++ b/plugins/cilium-cni/cilium-cni.go @@ -23,7 +23,7 @@ import ( "sort" "github.com/cilium/cilium/api/v1/models" - "github.com/cilium/cilium/common/addressing" + "github.com/cilium/cilium/pkg/addressing" "github.com/cilium/cilium/pkg/client" "github.com/cilium/cilium/pkg/datapath/connector" "github.com/cilium/cilium/pkg/datapath/linux/route" diff --git a/plugins/cilium-docker/main.go b/plugins/cilium-docker/main.go index bc810de13d35..0f72bd5e8d08 100644 --- a/plugins/cilium-docker/main.go +++ b/plugins/cilium-docker/main.go @@ -18,7 +18,7 @@ import ( "os" "path/filepath" - "github.com/cilium/cilium/common" + "github.com/cilium/cilium/pkg/common" "github.com/cilium/cilium/pkg/logging" "github.com/cilium/cilium/pkg/logging/logfields" "github.com/cilium/cilium/plugins/cilium-docker/driver"