From c1d31074185588be935ba0115baae221742de172 Mon Sep 17 00:00:00 2001 From: Raj Chaudhuri Date: Fri, 1 Mar 2024 18:05:19 +0530 Subject: [PATCH] Changed module name, edited default manifests in prog/weave-kube * Module name changed to `github.com/rajch/weave` * Added environment variable `CHECKPOINT_DISABLE=1` to default manifests, to bypass weaveworks telemetry --- common/docker/client.go | 2 +- go.mod | 2 +- ipam/allocate.go | 4 ++-- ipam/allocator.go | 17 ++++++------- ipam/allocator_test.go | 8 +++---- ipam/claim.go | 6 ++--- ipam/http.go | 6 ++--- ipam/http_test.go | 4 ++-- ipam/ring/entry.go | 9 +++---- ipam/ring/ring.go | 4 ++-- ipam/ring/ring_test.go | 4 ++-- ipam/space/space.go | 4 ++-- ipam/space/space_test.go | 4 ++-- ipam/status.go | 5 ++-- ipam/testutils_test.go | 4 ++-- ipam/tracker/awsvpc.go | 4 ++-- ipam/tracker/tracker.go | 2 +- nameserver/dns.go | 2 +- nameserver/dns_test.go | 2 +- nameserver/entry.go | 2 +- nameserver/entry_test.go | 2 +- nameserver/http.go | 4 ++-- nameserver/nameserver.go | 4 ++-- nameserver/nameserver_test.go | 4 ++-- net/address/address.go | 2 +- net/bridge.go | 12 +++++----- net/if.go | 2 +- net/ipset/ipset.go | 2 +- net/uuid.go | 2 +- npc/analyser.go | 2 +- npc/controller.go | 8 +++---- npc/controller_test.go | 10 ++++---- npc/ipblock.go | 4 ++-- npc/metrics/metrics.go | 2 +- npc/namespace.go | 8 +++---- npc/rule.go | 8 +++---- npc/rule_test.go | 5 ++-- npc/selector.go | 10 ++++---- npc/ulogd/ulogd.go | 2 +- plugin/ipam/driver.go | 4 ++-- plugin/net/cni.go | 6 ++--- plugin/net/driver.go | 10 ++++---- plugin/net/watcher.go | 6 ++--- plugin/plugin.go | 14 +++++------ prog/kube-utils/kube_test.go | 2 +- prog/kube-utils/main.go | 4 ++-- prog/kube-utils/peerlist.go | 2 +- prog/weave-kube/weave-daemonset-k8s-1.11.yaml | 2 ++ prog/weave-kube/weave-daemonset-k8s-1.8.yaml | 2 ++ prog/weave-kube/weave-daemonset-k8s-1.9.yaml | 2 ++ prog/weave-npc/main.go | 14 +++++------ prog/weaver/checkpoint.go | 2 +- prog/weaver/discovery.go | 2 +- prog/weaver/http.go | 14 +++++------ prog/weaver/main.go | 24 +++++++++---------- prog/weaver/main_test.go | 2 +- prog/weaver/metrics.go | 8 +++---- prog/weaver/reclaim.go | 14 +++++------ prog/weaveutil/addrs.go | 4 ++-- prog/weaveutil/attach.go | 4 ++-- prog/weaveutil/bridge.go | 2 +- prog/weaveutil/cni.go | 8 +++---- prog/weaveutil/datapath.go | 2 +- prog/weaveutil/db_flag.go | 2 +- prog/weaveutil/docker_tls_args.go | 2 +- prog/weaveutil/netcheck.go | 2 +- prog/weaveutil/proc-addrs.go | 4 ++-- prog/weaveutil/unique_id.go | 2 +- prog/weavewait/check_network_iface.go | 3 ++- prog/weavewait/check_network_iface_mcast.go | 3 ++- proxy/common.go | 6 ++--- proxy/proxy.go | 6 ++--- reweave/CHANGELOG.md | 18 +++++++++++++- reweave/Makefile | 2 +- router/fastdp.go | 8 +++---- router/http.go | 6 ++--- router/network_router.go | 6 ++--- testing/gossip/mocks.go | 2 +- vendor/github.com/weaveworks/mesh/gossip.go | 2 +- 79 files changed, 222 insertions(+), 194 deletions(-) diff --git a/common/docker/client.go b/common/docker/client.go index ddbe4aae..321c08c6 100644 --- a/common/docker/client.go +++ b/common/docker/client.go @@ -8,7 +8,7 @@ import ( docker "github.com/fsouza/go-dockerclient" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) const ( diff --git a/go.mod b/go.mod index beced12e..d95955f1 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/weaveworks/weave +module github.com/rajch/weave go 1.20 diff --git a/ipam/allocate.go b/ipam/allocate.go index c4092a12..6d297550 100644 --- a/ipam/allocate.go +++ b/ipam/allocate.go @@ -3,8 +3,8 @@ package ipam import ( "fmt" - "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/api" + "github.com/rajch/weave/net/address" ) type allocateResult struct { diff --git a/ipam/allocator.go b/ipam/allocator.go index c4048de7..08505134 100644 --- a/ipam/allocator.go +++ b/ipam/allocator.go @@ -9,13 +9,13 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/db" - "github.com/weaveworks/weave/ipam/paxos" - "github.com/weaveworks/weave/ipam/ring" - "github.com/weaveworks/weave/ipam/space" - "github.com/weaveworks/weave/ipam/tracker" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/db" + "github.com/rajch/weave/ipam/paxos" + "github.com/rajch/weave/ipam/ring" + "github.com/rajch/weave/ipam/space" + "github.com/rajch/weave/ipam/tracker" + "github.com/rajch/weave/net/address" ) // Kinds of message we can unicast to other peers @@ -541,7 +541,8 @@ func (alloc *Allocator) annotatePeernames(names []mesh.PeerName) []string { // in the ring. Async. // // NB: the function is invoked by the gossip library routines and should be -// registered manually. +// +// registered manually. func (alloc *Allocator) PeerGone(peerName mesh.PeerName) { alloc.debugf("PeerGone: peer %s", peerName) diff --git a/ipam/allocator_test.go b/ipam/allocator_test.go index a60c72d4..8cfe02b0 100644 --- a/ipam/allocator_test.go +++ b/ipam/allocator_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/testing/gossip" + "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/testing/gossip" ) const ( diff --git a/ipam/claim.go b/ipam/claim.go index 153eb7d1..044de48a 100644 --- a/ipam/claim.go +++ b/ipam/claim.go @@ -5,9 +5,9 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) type claim struct { diff --git a/ipam/http.go b/ipam/http.go index 416c1e86..4a3c9728 100644 --- a/ipam/http.go +++ b/ipam/http.go @@ -8,9 +8,9 @@ import ( "github.com/gorilla/mux" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/docker" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/docker" + "github.com/rajch/weave/net/address" ) func badRequest(w http.ResponseWriter, err error) { diff --git a/ipam/http_test.go b/ipam/http_test.go index 058c5d94..5e442315 100644 --- a/ipam/http_test.go +++ b/ipam/http_test.go @@ -12,9 +12,9 @@ import ( "time" "github.com/gorilla/mux" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" ) func HTTPPost(t *testing.T, url string) string { diff --git a/ipam/ring/entry.go b/ipam/ring/entry.go index c3f04edf..4e2cf886 100644 --- a/ipam/ring/entry.go +++ b/ipam/ring/entry.go @@ -6,8 +6,8 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) // Entry represents entries around the ring @@ -74,8 +74,9 @@ func (es entries) get(token address.Address) (*entry, bool) { // Is token between entries at i and j? // NB i and j can overflow and will wrap // NBB this function does not work very well if there is only one -// token on the ring; luckily an accurate answer is not needed -// by the call sites in this case. +// +// token on the ring; luckily an accurate answer is not needed +// by the call sites in this case. func (es entries) between(token address.Address, i, j int) bool { common.Assert(i < j) diff --git a/ipam/ring/ring.go b/ipam/ring/ring.go index e1cb1bcd..ada395de 100644 --- a/ipam/ring/ring.go +++ b/ipam/ring/ring.go @@ -14,8 +14,8 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) type OnUpdate func(prev, curr []address.Range, local bool) diff --git a/ipam/ring/ring_test.go b/ipam/ring/ring_test.go index c137de65..376b80c9 100644 --- a/ipam/ring/ring_test.go +++ b/ipam/ring/ring_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) var ( diff --git a/ipam/space/space.go b/ipam/space/space.go index 69ad28a9..8f9a30fc 100644 --- a/ipam/space/space.go +++ b/ipam/space/space.go @@ -5,8 +5,8 @@ import ( "fmt" "sort" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) type Space struct { diff --git a/ipam/space/space_test.go b/ipam/space/space_test.go index e123287d..5f0dfe87 100644 --- a/ipam/space/space_test.go +++ b/ipam/space/space_test.go @@ -3,9 +3,9 @@ package space import ( "testing" + "github.com/rajch/weave/net/address" + wt "github.com/rajch/weave/testing" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/net/address" - wt "github.com/weaveworks/weave/testing" ) func makeSpace(start address.Address, size address.Offset) *Space { diff --git a/ipam/status.go b/ipam/status.go index 1b4c7ab4..dbda05c8 100644 --- a/ipam/status.go +++ b/ipam/status.go @@ -2,8 +2,9 @@ package ipam import ( "fmt" - "github.com/weaveworks/weave/ipam/paxos" - "github.com/weaveworks/weave/net/address" + + "github.com/rajch/weave/ipam/paxos" + "github.com/rajch/weave/net/address" ) type Status struct { diff --git a/ipam/testutils_test.go b/ipam/testutils_test.go index 3039dd50..e1e152bc 100644 --- a/ipam/testutils_test.go +++ b/ipam/testutils_test.go @@ -9,9 +9,9 @@ import ( "github.com/weaveworks/mesh" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/testing/gossip" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/testing/gossip" ) type mockMessage struct { diff --git a/ipam/tracker/awsvpc.go b/ipam/tracker/awsvpc.go index 0e9d1e5d..6e044e8c 100644 --- a/ipam/tracker/awsvpc.go +++ b/ipam/tracker/awsvpc.go @@ -29,8 +29,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/vishvananda/netlink" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) type AWSVPCTracker struct { diff --git a/ipam/tracker/tracker.go b/ipam/tracker/tracker.go index 61302e2a..d2c9edcf 100644 --- a/ipam/tracker/tracker.go +++ b/ipam/tracker/tracker.go @@ -1,7 +1,7 @@ package tracker import ( - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/net/address" ) // LocalRangeTracker is an interface for tracking changes in the IPAM ring. diff --git a/nameserver/dns.go b/nameserver/dns.go index ac8cf527..08372cb3 100644 --- a/nameserver/dns.go +++ b/nameserver/dns.go @@ -13,7 +13,7 @@ import ( "github.com/miekg/dns" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/net/address" ) const ( diff --git a/nameserver/dns_test.go b/nameserver/dns_test.go index ede25ffe..10ec165a 100644 --- a/nameserver/dns_test.go +++ b/nameserver/dns_test.go @@ -11,8 +11,8 @@ import ( "github.com/miekg/dns" "github.com/stretchr/testify/require" + "github.com/rajch/weave/net/address" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/net/address" ) type mockUpstream struct { diff --git a/nameserver/entry.go b/nameserver/entry.go index d8b2c67e..ec678323 100644 --- a/nameserver/entry.go +++ b/nameserver/entry.go @@ -10,7 +10,7 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/net/address" ) var now = func() int64 { return time.Now().Unix() } diff --git a/nameserver/entry_test.go b/nameserver/entry_test.go index 3834474a..b0b7e397 100644 --- a/nameserver/entry_test.go +++ b/nameserver/entry_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/net/address" ) func l(es Entries) Entries { diff --git a/nameserver/http.go b/nameserver/http.go index d7b91dea..e5e83c5e 100644 --- a/nameserver/http.go +++ b/nameserver/http.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/mux" "github.com/miekg/dns" - "github.com/weaveworks/weave/common/docker" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common/docker" + "github.com/rajch/weave/net/address" ) func (n *Nameserver) badRequest(w http.ResponseWriter, err error) { diff --git a/nameserver/nameserver.go b/nameserver/nameserver.go index 75879276..6c6ec7a5 100644 --- a/nameserver/nameserver.go +++ b/nameserver/nameserver.go @@ -8,8 +8,8 @@ import ( "github.com/miekg/dns" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/address" ) const ( diff --git a/nameserver/nameserver_test.go b/nameserver/nameserver_test.go index ce409443..4c1876dd 100644 --- a/nameserver/nameserver_test.go +++ b/nameserver/nameserver_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/testing/gossip" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/testing/gossip" ) func makeNameserver(name mesh.PeerName) *Nameserver { diff --git a/net/address/address.go b/net/address/address.go index 89ddf415..d76c634b 100644 --- a/net/address/address.go +++ b/net/address/address.go @@ -4,7 +4,7 @@ import ( "fmt" "net" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) // Using 32-bit integer to represent IPv4 address diff --git a/net/bridge.go b/net/bridge.go index 6d5ff704..e1f7c248 100644 --- a/net/bridge.go +++ b/net/bridge.go @@ -12,11 +12,11 @@ import ( "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/chains" - "github.com/weaveworks/weave/common/odp" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/net/ipset" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/common/odp" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/net/ipset" ) /* This code implements three possible configurations to connect @@ -48,7 +48,7 @@ the "datapath" device, via "router/fastdp.go:fastDatapathBridge" "weave" is an Open vSwitch datapath, and capture/injection are as in BridgedFastdp. Not used by default due to missing conntrack support in -datapath of old kernel versions (https://github.com/weaveworks/weave/issues/1577). +datapath of old kernel versions (https://github.com/rajch/weave/issues/1577). */ const ( diff --git a/net/if.go b/net/if.go index 55445e87..41adf37f 100644 --- a/net/if.go +++ b/net/if.go @@ -21,7 +21,7 @@ func ensureInterface(ifaceName string) (*net.Interface, error) { ch := make(chan netlink.LinkUpdate) // NB: We do not supply (and eventually close) a 'done' channel // here since that can cause incorrect file descriptor - // re-usage. See https://github.com/weaveworks/weave/issues/2120 + // re-usage. See https://github.com/rajch/weave/issues/2120 if err := netlink.LinkSubscribe(ch, nil); err != nil { return nil, err } diff --git a/net/ipset/ipset.go b/net/ipset/ipset.go index 072046cd..55a6d6b2 100644 --- a/net/ipset/ipset.go +++ b/net/ipset/ipset.go @@ -53,7 +53,7 @@ type ipset struct { // List of users per ipset entry. User is either a namespace or a pod. // There might be multiple users for the same ipset & entry pair because // events from k8s API server might be out of order causing duplicate IPs: - // https://github.com/weaveworks/weave/issues/2792. + // https://github.com/rajch/weave/issues/2792. users map[entryKey]map[UID]struct{} } diff --git a/net/uuid.go b/net/uuid.go index 1f15b425..5b4cefe4 100644 --- a/net/uuid.go +++ b/net/uuid.go @@ -6,8 +6,8 @@ import ( "net" "os" + "github.com/rajch/weave/db" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/db" ) func getOldStyleSystemUUID() ([]byte, error) { diff --git a/npc/analyser.go b/npc/analyser.go index f6e7b9f5..fb88289d 100644 --- a/npc/analyser.go +++ b/npc/analyser.go @@ -7,7 +7,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/weaveworks/weave/net/ipset" + "github.com/rajch/weave/net/ipset" ) func (ns *ns) analysePolicy(policy *networkingv1.NetworkPolicy) ( diff --git a/npc/controller.go b/npc/controller.go index 92ff76e3..8f9e146e 100644 --- a/npc/controller.go +++ b/npc/controller.go @@ -12,10 +12,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/chains" - "github.com/weaveworks/weave/net/ipset" - "github.com/weaveworks/weave/npc/iptables" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/net/ipset" + "github.com/rajch/weave/npc/iptables" ) type NetworkPolicyController interface { diff --git a/npc/controller_test.go b/npc/controller_test.go index 9e75b8f7..4e32bcd8 100644 --- a/npc/controller_test.go +++ b/npc/controller_test.go @@ -8,9 +8,9 @@ import ( "testing" "github.com/pkg/errors" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/net/ipset" "github.com/stretchr/testify/require" - "github.com/weaveworks/weave/common/chains" - "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" @@ -156,7 +156,7 @@ func (ipt *mockIPTables) Insert(table, chain string, pos int, rulespec ...string func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) { // Test for race condition between namespace and networkpolicy events - // https://github.com/weaveworks/weave/issues/3059 + // https://github.com/rajch/weave/issues/3059 sourceNamespace := &coreapi.Namespace{ ObjectMeta: metav1.ObjectMeta{ @@ -456,7 +456,7 @@ func TestOutOfOrderPodEvents(t *testing.T) { require.False(t, m.entriesExist(runBarIPSetName, podIP)) } -// Test case for https://github.com/weaveworks/weave/issues/3222 +// Test case for https://github.com/rajch/weave/issues/3222 func TestNewTargetSelector(t *testing.T) { const ( ingressDefaultAllowIPSetName = "weave-;rGqyMIl1HN^cfDki~Z$3]6!N" @@ -633,7 +633,7 @@ func TestEgressPolicyWithIPBlock(t *testing.T) { require.Equal(t, 2, len(m.sets[exceptIPSetNameInNonDefault].subSets)) } -// Test case for https://github.com/weaveworks/weave/issues/3653 +// Test case for https://github.com/rajch/weave/issues/3653 func TestIngressPolicyWithIPBlockAndPortSpecified(t *testing.T) { const ( barPodIP = "10.32.0.11" diff --git a/npc/ipblock.go b/npc/ipblock.go index 0c66a22e..6a043be8 100644 --- a/npc/ipblock.go +++ b/npc/ipblock.go @@ -7,8 +7,8 @@ import ( networkingv1 "k8s.io/api/networking/v1" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/ipset" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/ipset" ) type ipBlockSpec struct { diff --git a/npc/metrics/metrics.go b/npc/metrics/metrics.go index cad65531..26d8b680 100644 --- a/npc/metrics/metrics.go +++ b/npc/metrics/metrics.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) var ( diff --git a/npc/namespace.go b/npc/namespace.go index 7bbc723b..8ac32961 100644 --- a/npc/namespace.go +++ b/npc/namespace.go @@ -10,10 +10,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/chains" - "github.com/weaveworks/weave/net/ipset" - "github.com/weaveworks/weave/npc/iptables" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/net/ipset" + "github.com/rajch/weave/npc/iptables" ) var errInvalidNetworkPolicyObjType = errors.New("invalid NetworkPolicy object type") diff --git a/npc/rule.go b/npc/rule.go index b4d974ea..6eca2d64 100644 --- a/npc/rule.go +++ b/npc/rule.go @@ -5,10 +5,10 @@ import ( "reflect" "strings" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/chains" - "github.com/weaveworks/weave/net/ipset" - "github.com/weaveworks/weave/npc/iptables" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/net/ipset" + "github.com/rajch/weave/npc/iptables" ) type ruleHost interface { diff --git a/npc/rule_test.go b/npc/rule_test.go index 15535449..b3933e24 100644 --- a/npc/rule_test.go +++ b/npc/rule_test.go @@ -1,13 +1,14 @@ package npc import ( - "github.com/stretchr/testify/require" "testing" + + "github.com/stretchr/testify/require" ) func TestRegressionHandleNil3095(t *testing.T) { // Test for handling nil values - // https://github.com/weaveworks/weave/issues/3095 + // https://github.com/rajch/weave/issues/3095 rs := newRuleSpec(policyTypeIngress, nil, nil, nil, nil) diff --git a/npc/selector.go b/npc/selector.go index dfe73aee..3fa24ebf 100644 --- a/npc/selector.go +++ b/npc/selector.go @@ -6,8 +6,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net/ipset" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net/ipset" ) type selectorSpec struct { @@ -121,9 +121,9 @@ func newSelectorSet(ips ipset.Interface, onNewSelector selectorFn, onNewTargetSe onNewSelector: onNewSelector, onNewTargetSelector: onNewTargetSelector, onDestroyTargetSelector: onDestroyTargetSelector, - users: make(map[string]map[ipset.UID]struct{}), - entries: make(map[string]*selector), - targetSelectorsCount: make(map[string]map[policyType]int)} + users: make(map[string]map[ipset.UID]struct{}), + entries: make(map[string]*selector), + targetSelectorsCount: make(map[string]map[policyType]int)} } func (ss *selectorSet) addToMatchingPodSelector(user ipset.UID, podLabelsMap map[string]string, entry string, comment string) (bool, bool, error) { diff --git a/npc/ulogd/ulogd.go b/npc/ulogd/ulogd.go index b61e0bc6..59fed9ab 100644 --- a/npc/ulogd/ulogd.go +++ b/npc/ulogd/ulogd.go @@ -6,7 +6,7 @@ import ( "os/exec" "syscall" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) func waitForExit(cmd *exec.Cmd) { diff --git a/plugin/ipam/driver.go b/plugin/ipam/driver.go index 4057b3d7..5d2a0b98 100644 --- a/plugin/ipam/driver.go +++ b/plugin/ipam/driver.go @@ -7,8 +7,8 @@ import ( "github.com/docker/libnetwork/discoverapi" "github.com/docker/libnetwork/netlabel" - "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/api" + "github.com/rajch/weave/common" ) type Ipam struct { diff --git a/plugin/net/cni.go b/plugin/net/cni.go index c91b1e69..bed6669b 100644 --- a/plugin/net/cni.go +++ b/plugin/net/cni.go @@ -13,11 +13,11 @@ import ( "github.com/containernetworking/cni/pkg/types" current "github.com/containernetworking/cni/pkg/types/100" "github.com/containernetworking/plugins/pkg/ipam" + weaveapi "github.com/rajch/weave/api" + weavenet "github.com/rajch/weave/net" + ipamplugin "github.com/rajch/weave/plugin/ipam" "github.com/vishvananda/netlink" "github.com/vishvananda/netns" - weaveapi "github.com/weaveworks/weave/api" - weavenet "github.com/weaveworks/weave/net" - ipamplugin "github.com/weaveworks/weave/plugin/ipam" ) var ( diff --git a/plugin/net/driver.go b/plugin/net/driver.go index 5af2aa9b..54c8c87b 100644 --- a/plugin/net/driver.go +++ b/plugin/net/driver.go @@ -10,12 +10,12 @@ import ( "github.com/docker/libnetwork/types" "golang.org/x/sys/unix" + weaveapi "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/docker" + weavenet "github.com/rajch/weave/net" + "github.com/rajch/weave/plugin/skel" "github.com/vishvananda/netlink" - weaveapi "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/docker" - weavenet "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/plugin/skel" ) const ( diff --git a/plugin/net/watcher.go b/plugin/net/watcher.go index f524fd79..ef15a0ac 100644 --- a/plugin/net/watcher.go +++ b/plugin/net/watcher.go @@ -3,9 +3,9 @@ package plugin import ( "fmt" - weaveapi "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common/docker" - weavenet "github.com/weaveworks/weave/net" + weaveapi "github.com/rajch/weave/api" + "github.com/rajch/weave/common/docker" + weavenet "github.com/rajch/weave/net" ) type watcher struct { diff --git a/plugin/plugin.go b/plugin/plugin.go index 5b644bf6..740f8507 100644 --- a/plugin/plugin.go +++ b/plugin/plugin.go @@ -7,13 +7,13 @@ import ( "strings" "github.com/docker/libnetwork/ipamapi" - weaveapi "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/docker" - weavenet "github.com/weaveworks/weave/net" - ipamplugin "github.com/weaveworks/weave/plugin/ipam" - netplugin "github.com/weaveworks/weave/plugin/net" - "github.com/weaveworks/weave/plugin/skel" + weaveapi "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/docker" + weavenet "github.com/rajch/weave/net" + ipamplugin "github.com/rajch/weave/plugin/ipam" + netplugin "github.com/rajch/weave/plugin/net" + "github.com/rajch/weave/plugin/skel" ) const ( diff --git a/prog/kube-utils/kube_test.go b/prog/kube-utils/kube_test.go index fe663e4b..f0e17c55 100644 --- a/prog/kube-utils/kube_test.go +++ b/prog/kube-utils/kube_test.go @@ -8,7 +8,7 @@ import ( "k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/testing" - weavetracker "github.com/weaveworks/weave/testing/kubernetes/testing" + weavetracker "github.com/rajch/weave/testing/kubernetes/testing" ) var scheme = runtime.NewScheme() diff --git a/prog/kube-utils/main.go b/prog/kube-utils/main.go index 9569996c..919e7d69 100644 --- a/prog/kube-utils/main.go +++ b/prog/kube-utils/main.go @@ -24,8 +24,8 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - weaveapi "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" + weaveapi "github.com/rajch/weave/api" + "github.com/rajch/weave/common" ) type nodeInfo struct { diff --git a/prog/kube-utils/peerlist.go b/prog/kube-utils/peerlist.go index 61e2c1d3..0a6d0ffa 100644 --- a/prog/kube-utils/peerlist.go +++ b/prog/kube-utils/peerlist.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "k8s.io/client-go/kubernetes" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) const ( diff --git a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml index 69619b3b..fc27c385 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml @@ -151,6 +151,8 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + - name: CHECKPOINT_DISABLE + value: "1" image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: diff --git a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml index 85266f8b..900e175f 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml @@ -148,6 +148,8 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + - name: CHECKPOINT_DISABLE + value: "1" image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: diff --git a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml index 777b9f79..b8573dad 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml @@ -151,6 +151,8 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName + - name: CHECKPOINT_DISABLE + value: "1" image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: diff --git a/prog/weave-npc/main.go b/prog/weave-npc/main.go index cfc48145..78c0d104 100644 --- a/prog/weave-npc/main.go +++ b/prog/weave-npc/main.go @@ -19,13 +19,13 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/cache" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/chains" - "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/net/ipset" - "github.com/weaveworks/weave/npc" - "github.com/weaveworks/weave/npc/metrics" - "github.com/weaveworks/weave/npc/ulogd" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/chains" + "github.com/rajch/weave/net" + "github.com/rajch/weave/net/ipset" + "github.com/rajch/weave/npc" + "github.com/rajch/weave/npc/metrics" + "github.com/rajch/weave/npc/ulogd" ) var ( diff --git a/prog/weaver/checkpoint.go b/prog/weaver/checkpoint.go index 15098a00..509ee995 100644 --- a/prog/weaver/checkpoint.go +++ b/prog/weaver/checkpoint.go @@ -8,8 +8,8 @@ import ( "syscall" "time" + weave "github.com/rajch/weave/router" checkpoint "github.com/weaveworks/go-checkpoint" - weave "github.com/weaveworks/weave/router" ) var checker *checkpoint.Checker diff --git a/prog/weaver/discovery.go b/prog/weaver/discovery.go index b4f95a7f..f247b5f2 100644 --- a/prog/weaver/discovery.go +++ b/prog/weaver/discovery.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" - "github.com/weaveworks/weave/ipam" + "github.com/rajch/weave/ipam" ) // TODO: move these definitions somewhere more shareable diff --git a/prog/weaver/http.go b/prog/weaver/http.go index 7803eae8..4e576ca3 100644 --- a/prog/weaver/http.go +++ b/prog/weaver/http.go @@ -12,14 +12,14 @@ import ( "github.com/gorilla/mux" "github.com/weaveworks/mesh" + "github.com/rajch/weave/common" + "github.com/rajch/weave/ipam" + "github.com/rajch/weave/nameserver" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/plugin" + "github.com/rajch/weave/proxy" + weave "github.com/rajch/weave/router" "github.com/weaveworks/go-checkpoint" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/nameserver" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/plugin" - "github.com/weaveworks/weave/proxy" - weave "github.com/weaveworks/weave/router" ) var allConnectionStates = []string{"established", "pending", "retrying", "failed", "connecting"} diff --git a/prog/weaver/main.go b/prog/weaver/main.go index 6348382d..db2e6320 100644 --- a/prog/weaver/main.go +++ b/prog/weaver/main.go @@ -18,18 +18,18 @@ import ( "github.com/weaveworks/common/signals" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/common/docker" - "github.com/weaveworks/weave/db" - "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/ipam/tracker" - "github.com/weaveworks/weave/nameserver" - weavenet "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/net/address" - "github.com/weaveworks/weave/net/ipset" - "github.com/weaveworks/weave/plugin" - weaveproxy "github.com/weaveworks/weave/proxy" - weave "github.com/weaveworks/weave/router" + "github.com/rajch/weave/common" + "github.com/rajch/weave/common/docker" + "github.com/rajch/weave/db" + "github.com/rajch/weave/ipam" + "github.com/rajch/weave/ipam/tracker" + "github.com/rajch/weave/nameserver" + weavenet "github.com/rajch/weave/net" + "github.com/rajch/weave/net/address" + "github.com/rajch/weave/net/ipset" + "github.com/rajch/weave/plugin" + weaveproxy "github.com/rajch/weave/proxy" + weave "github.com/rajch/weave/router" ) var version = "unreleased" diff --git a/prog/weaver/main_test.go b/prog/weaver/main_test.go index c9cfe8b3..bf3dfbaf 100644 --- a/prog/weaver/main_test.go +++ b/prog/weaver/main_test.go @@ -3,7 +3,7 @@ package main import ( "testing" - weavetest "github.com/weaveworks/weave/testing" + weavetest "github.com/rajch/weave/testing" ) func TestMain(t *testing.T) { diff --git a/prog/weaver/metrics.go b/prog/weaver/metrics.go index 1cdcf92b..37561cb5 100644 --- a/prog/weaver/metrics.go +++ b/prog/weaver/metrics.go @@ -6,10 +6,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/nameserver" - "github.com/weaveworks/weave/net/address" - weave "github.com/weaveworks/weave/router" + "github.com/rajch/weave/ipam" + "github.com/rajch/weave/nameserver" + "github.com/rajch/weave/net/address" + weave "github.com/rajch/weave/router" ) func metricsHandler(router *weave.NetworkRouter, allocator *ipam.Allocator, ns *nameserver.Nameserver, dnsserver *nameserver.DNSServer) http.Handler { diff --git a/prog/weaver/reclaim.go b/prog/weaver/reclaim.go index 88461818..2933bdfc 100644 --- a/prog/weaver/reclaim.go +++ b/prog/weaver/reclaim.go @@ -6,14 +6,14 @@ import ( docker "github.com/fsouza/go-dockerclient" + "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + weavedocker "github.com/rajch/weave/common/docker" + "github.com/rajch/weave/ipam" + "github.com/rajch/weave/nameserver" + weavenet "github.com/rajch/weave/net" + "github.com/rajch/weave/net/address" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - weavedocker "github.com/weaveworks/weave/common/docker" - "github.com/weaveworks/weave/ipam" - "github.com/weaveworks/weave/nameserver" - weavenet "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/net/address" ) func a(cidr *net.IPNet) address.CIDR { diff --git a/prog/weaveutil/addrs.go b/prog/weaveutil/addrs.go index 593abdce..394cf2c1 100644 --- a/prog/weaveutil/addrs.go +++ b/prog/weaveutil/addrs.go @@ -3,9 +3,9 @@ package main import ( "fmt" - "github.com/fsouza/go-dockerclient" + docker "github.com/fsouza/go-dockerclient" - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func containerAddrs(args []string) error { diff --git a/prog/weaveutil/attach.go b/prog/weaveutil/attach.go index e4cfe0b9..d8d591b2 100644 --- a/prog/weaveutil/attach.go +++ b/prog/weaveutil/attach.go @@ -9,8 +9,8 @@ import ( "github.com/vishvananda/netns" - weavenet "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/proxy" + weavenet "github.com/rajch/weave/net" + "github.com/rajch/weave/proxy" ) func attach(args []string) error { diff --git a/prog/weaveutil/bridge.go b/prog/weaveutil/bridge.go index ccb3a4dc..0119ef52 100644 --- a/prog/weaveutil/bridge.go +++ b/prog/weaveutil/bridge.go @@ -3,7 +3,7 @@ package main import ( "fmt" - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func detectBridgeType(args []string) error { diff --git a/prog/weaveutil/cni.go b/prog/weaveutil/cni.go index f555a427..86d7b27a 100644 --- a/prog/weaveutil/cni.go +++ b/prog/weaveutil/cni.go @@ -7,10 +7,10 @@ import ( "github.com/containernetworking/cni/pkg/version" bv "github.com/containernetworking/plugins/pkg/utils/buildversion" - weaveapi "github.com/weaveworks/weave/api" - "github.com/weaveworks/weave/common" - ipamplugin "github.com/weaveworks/weave/plugin/ipam" - netplugin "github.com/weaveworks/weave/plugin/net" + weaveapi "github.com/rajch/weave/api" + "github.com/rajch/weave/common" + ipamplugin "github.com/rajch/weave/plugin/ipam" + netplugin "github.com/rajch/weave/plugin/net" ) func cniNet(args []string) error { diff --git a/prog/weaveutil/datapath.go b/prog/weaveutil/datapath.go index 52e320f8..3b1f1e5f 100644 --- a/prog/weaveutil/datapath.go +++ b/prog/weaveutil/datapath.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/weaveworks/weave/common/odp" + "github.com/rajch/weave/common/odp" ) func createDatapath(args []string) error { diff --git a/prog/weaveutil/db_flag.go b/prog/weaveutil/db_flag.go index 6d32587b..a503bd2f 100644 --- a/prog/weaveutil/db_flag.go +++ b/prog/weaveutil/db_flag.go @@ -4,7 +4,7 @@ package main import ( "fmt" - "github.com/weaveworks/weave/db" + "github.com/rajch/weave/db" ) const dbFlagPrefix = "flag:" diff --git a/prog/weaveutil/docker_tls_args.go b/prog/weaveutil/docker_tls_args.go index 9278b722..0bffe548 100644 --- a/prog/weaveutil/docker_tls_args.go +++ b/prog/weaveutil/docker_tls_args.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) func dockerTLSArgs(args []string) error { diff --git a/prog/weaveutil/netcheck.go b/prog/weaveutil/netcheck.go index 843fab22..f74ba7b0 100644 --- a/prog/weaveutil/netcheck.go +++ b/prog/weaveutil/netcheck.go @@ -4,7 +4,7 @@ package main import ( "net" - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func netcheck(args []string) error { diff --git a/prog/weaveutil/proc-addrs.go b/prog/weaveutil/proc-addrs.go index 17e08770..1d336b7b 100644 --- a/prog/weaveutil/proc-addrs.go +++ b/prog/weaveutil/proc-addrs.go @@ -3,8 +3,8 @@ package main import ( "strconv" - "github.com/weaveworks/weave/common" - weavenet "github.com/weaveworks/weave/net" + "github.com/rajch/weave/common" + weavenet "github.com/rajch/weave/net" ) func processAddrs(args []string) error { diff --git a/prog/weaveutil/unique_id.go b/prog/weaveutil/unique_id.go index c475cd20..ace035fb 100644 --- a/prog/weaveutil/unique_id.go +++ b/prog/weaveutil/unique_id.go @@ -3,7 +3,7 @@ package main import ( "fmt" - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func uniqueID(args []string) error { diff --git a/prog/weavewait/check_network_iface.go b/prog/weavewait/check_network_iface.go index 78490144..7689525c 100644 --- a/prog/weavewait/check_network_iface.go +++ b/prog/weavewait/check_network_iface.go @@ -1,9 +1,10 @@ +//go:build iface && !mcast // +build iface,!mcast package main import ( - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func checkNetwork() error { diff --git a/prog/weavewait/check_network_iface_mcast.go b/prog/weavewait/check_network_iface_mcast.go index 978da38d..cec7181b 100644 --- a/prog/weavewait/check_network_iface_mcast.go +++ b/prog/weavewait/check_network_iface_mcast.go @@ -1,9 +1,10 @@ +//go:build iface && mcast // +build iface,mcast package main import ( - weavenet "github.com/weaveworks/weave/net" + weavenet "github.com/rajch/weave/net" ) func checkNetwork() error { diff --git a/proxy/common.go b/proxy/common.go index 280cc0c8..fdaee8a0 100644 --- a/proxy/common.go +++ b/proxy/common.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/fsouza/go-dockerclient" - "github.com/weaveworks/weave/common" - weavedocker "github.com/weaveworks/weave/common/docker" + docker "github.com/fsouza/go-dockerclient" + "github.com/rajch/weave/common" + weavedocker "github.com/rajch/weave/common/docker" ) var ( diff --git a/proxy/proxy.go b/proxy/proxy.go index a1c57098..b5fc43e4 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -17,9 +17,9 @@ import ( docker "github.com/fsouza/go-dockerclient" "github.com/pkg/errors" - weaveapi "github.com/weaveworks/weave/api" - weavedocker "github.com/weaveworks/weave/common/docker" - weavenet "github.com/weaveworks/weave/net" + weaveapi "github.com/rajch/weave/api" + weavedocker "github.com/rajch/weave/common/docker" + weavenet "github.com/rajch/weave/net" ) const ( diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md index 051928e4..bb4e0c77 100644 --- a/reweave/CHANGELOG.md +++ b/reweave/CHANGELOG.md @@ -2,7 +2,23 @@ All changes made to the weave net codebase during the reweave effort will be documented in this file. -## 2.8.2-beta11 (0d58e179) latest +## latest + +### Changed + +* Module name changed to `github.com/rajch/weave` +* Added environment variable `CHECKPOINT_DISABLE=1` to default manifests, to bypass weaveworks telemetry + +## 2.8.2-beta12 (962bb57b) + +### Changed + +* Alpine base image upgraded to alpine:3.19.1 +* Upgraded github.com/containerd/containerd to v1.7.11 +* Upgraded github.com/opencontainers/runc to v1.1.12 +* Upgraded golang.org/x/crypto to v0.17.0 + +## 2.8.2-beta11 (0d58e179) ### Changed diff --git a/reweave/Makefile b/reweave/Makefile index fdaaea3a..ea341bf4 100644 --- a/reweave/Makefile +++ b/reweave/Makefile @@ -1,4 +1,4 @@ -IMAGE_VERSION ?= 2.8.2-beta12 +IMAGE_VERSION ?= 2.8.2-beta13 REGISTRY_USER ?= rajchaudhuri ALPINE_BASEIMAGE ?= alpine:3.19.1 diff --git a/router/fastdp.go b/router/fastdp.go index a25df7d4..bf0fc3ec 100644 --- a/router/fastdp.go +++ b/router/fastdp.go @@ -14,7 +14,7 @@ import ( "github.com/weaveworks/go-odp/odp" "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/net/ipsec" + "github.com/rajch/weave/net/ipsec" ) // The virtual bridge accepts packets from ODP vports and the router @@ -1322,9 +1322,9 @@ func (fastdp *FastDatapath) takeDecoder(lock *fastDatapathLock) *EthernetDecoder // mode on the weave bridge port which attaches the datapath. Such flow is // identified by either: // -// * in_port == out_port, where in_port is non-vxlan vport; -// * a packet is sent back to a vxlan tunnel it has been received from and -// the tunnel id is either the same or dstPeer and srcPeer are reversed. +// - in_port == out_port, where in_port is non-vxlan vport; +// - a packet is sent back to a vxlan tunnel it has been received from and +// the tunnel id is either the same or dstPeer and srcPeer are reversed. func (fastdp *FastDatapath) isHairpinFlow(flow *odp.FlowSpec) bool { var ( vxlanKey odp.TunnelAttrs diff --git a/router/http.go b/router/http.go index 0f014956..6007cabc 100644 --- a/router/http.go +++ b/router/http.go @@ -7,9 +7,9 @@ import ( "github.com/gorilla/mux" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/net" - "github.com/weaveworks/weave/net/address" + "github.com/rajch/weave/common" + "github.com/rajch/weave/net" + "github.com/rajch/weave/net/address" ) func (router *NetworkRouter) HandleHTTP(muxRouter *mux.Router) { diff --git a/router/network_router.go b/router/network_router.go index 4fdcf40b..99ff0b35 100644 --- a/router/network_router.go +++ b/router/network_router.go @@ -9,9 +9,9 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" - "github.com/weaveworks/weave/db" - weavenet "github.com/weaveworks/weave/net" + "github.com/rajch/weave/common" + "github.com/rajch/weave/db" + weavenet "github.com/rajch/weave/net" ) const ( diff --git a/testing/gossip/mocks.go b/testing/gossip/mocks.go index 2824e83a..c49308f9 100644 --- a/testing/gossip/mocks.go +++ b/testing/gossip/mocks.go @@ -9,7 +9,7 @@ import ( "github.com/weaveworks/mesh" - "github.com/weaveworks/weave/common" + "github.com/rajch/weave/common" ) // Router to convey gossip from one gossiper to another, for testing diff --git a/vendor/github.com/weaveworks/mesh/gossip.go b/vendor/github.com/weaveworks/mesh/gossip.go index 44bd6ede..a6185229 100644 --- a/vendor/github.com/weaveworks/mesh/gossip.go +++ b/vendor/github.com/weaveworks/mesh/gossip.go @@ -13,7 +13,7 @@ type Gossip interface { // Unicast takes []byte instead of GossipData because "to date there has // been no compelling reason [in practice] to do merging on unicast." // But there may be some motivation to have unicast Mergeable; see - // https://github.com/weaveworks/weave/issues/1764 + // https://github.com/rajch/weave/issues/1764 // // TODO(pb): for uniformity of interface, rather take GossipData? GossipUnicast(dst PeerName, msg []byte) error