reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed module name, edited default manifests in prog/weave-kube

Browse Source 
* Module name changed to `github.com/rajch/weave`
* Added environment variable `CHECKPOINT_DISABLE=1` to default manifests, to bypass weaveworks telemetry
This commit is contained in:
Raj Chaudhuri committed 2024-03-01 18:05:19 +05:30
1 parent 962bb57b60
commit c1d3107418
79 files changed
+215 -187
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

common/docker/client.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
docker "github.com/fsouza/go-dockerclient" docker "github.com/fsouza/go-dockerclient"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
const ( const (
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module github.com/weaveworks/weave module github.com/rajch/weave
go 1.20 go 1.20
ipam/allocate.go
+2 -2
View File
@@ -3,8 +3,8 @@ package ipam
import ( import (
"fmt" "fmt"
"github.com/weaveworks/weave/api" "github.com/rajch/weave/api"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
type allocateResult struct { type allocateResult struct {
ipam/allocator.go
+8 -7
View File
@@ -9,13 +9,13 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/db" "github.com/rajch/weave/db"
"github.com/weaveworks/weave/ipam/paxos" "github.com/rajch/weave/ipam/paxos"
"github.com/weaveworks/weave/ipam/ring" "github.com/rajch/weave/ipam/ring"
"github.com/weaveworks/weave/ipam/space" "github.com/rajch/weave/ipam/space"
"github.com/weaveworks/weave/ipam/tracker" "github.com/rajch/weave/ipam/tracker"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
// Kinds of message we can unicast to other peers // Kinds of message we can unicast to other peers
@@ -541,6 +541,7 @@ func (alloc *Allocator) annotatePeernames(names []mesh.PeerName) []string {
// in the ring. Async. // in the ring. Async.
// //
// NB: the function is invoked by the gossip library routines and should be // NB: the function is invoked by the gossip library routines and should be
//
// registered manually. // registered manually.
func (alloc *Allocator) PeerGone(peerName mesh.PeerName) { func (alloc *Allocator) PeerGone(peerName mesh.PeerName) {
alloc.debugf("PeerGone: peer %s", peerName) alloc.debugf("PeerGone: peer %s", peerName)
ipam/allocator_test.go
+4 -4
View File
@@ -9,10 +9,10 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/api" "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
"github.com/weaveworks/weave/testing/gossip" "github.com/rajch/weave/testing/gossip"
) )
const ( const (
ipam/claim.go
+3 -3
View File
@@ -5,9 +5,9 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/api" "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
type claim struct { type claim struct {
ipam/http.go
+3 -3
View File
@@ -8,9 +8,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/docker" "github.com/rajch/weave/common/docker"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
func badRequest(w http.ResponseWriter, err error) { func badRequest(w http.ResponseWriter, err error) {
ipam/http_test.go
+2 -2
View File
@@ -12,9 +12,9 @@ import (
"time" "time"
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/rajch/weave/common"
"github.com/rajch/weave/net/address"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/net/address"
) )
func HTTPPost(t *testing.T, url string) string { func HTTPPost(t *testing.T, url string) string {
ipam/ring/entry.go
+3 -2
View File
@@ -6,8 +6,8 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
// Entry represents entries around the ring // Entry represents entries around the ring
@@ -74,6 +74,7 @@ func (es entries) get(token address.Address) (*entry, bool) {
// Is token between entries at i and j? // Is token between entries at i and j?
// NB i and j can overflow and will wrap // NB i and j can overflow and will wrap
// NBB this function does not work very well if there is only one // NBB this function does not work very well if there is only one
//
// token on the ring; luckily an accurate answer is not needed // token on the ring; luckily an accurate answer is not needed
// by the call sites in this case. // by the call sites in this case.
func (es entries) between(token address.Address, i, j int) bool { func (es entries) between(token address.Address, i, j int) bool {
ipam/ring/ring.go
+2 -2
View File
@@ -14,8 +14,8 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
type OnUpdate func(prev, curr []address.Range, local bool) type OnUpdate func(prev, curr []address.Range, local bool)
ipam/ring/ring_test.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
var ( var (
ipam/space/space.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"sort" "sort"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
type Space struct { type Space struct {
ipam/space/space_test.go
+2 -2
View File
@@ -3,9 +3,9 @@ package space
import ( import (
"testing" "testing"
"github.com/rajch/weave/net/address"
wt "github.com/rajch/weave/testing"
"github.com/stretchr/testify/require" "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 { func makeSpace(start address.Address, size address.Offset) *Space {
ipam/status.go
+3 -2
View File
@@ -2,8 +2,9 @@ package ipam
import ( import (
"fmt" "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 { type Status struct {
ipam/testutils_test.go
+2 -2
View File
@@ -9,9 +9,9 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/rajch/weave/net/address"
"github.com/rajch/weave/testing/gossip"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/net/address"
"github.com/weaveworks/weave/testing/gossip"
) )
type mockMessage struct { type mockMessage struct {
ipam/tracker/awsvpc.go
+2 -2
View File
@@ -29,8 +29,8 @@ import (
"github.com/aws/aws-sdk-go/service/ec2" "github.com/aws/aws-sdk-go/service/ec2"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
type AWSVPCTracker struct { type AWSVPCTracker struct {
ipam/tracker/tracker.go
+1 -1
View File
@@ -1,7 +1,7 @@
package tracker package tracker
import ( import (
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
// LocalRangeTracker is an interface for tracking changes in the IPAM ring. // LocalRangeTracker is an interface for tracking changes in the IPAM ring.
nameserver/dns.go
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
const ( const (
nameserver/dns_test.go
+1 -1
View File
@@ -11,8 +11,8 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/rajch/weave/net/address"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address"
) )
type mockUpstream struct { type mockUpstream struct {
nameserver/entry.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
var now = func() int64 { return time.Now().Unix() } var now = func() int64 { return time.Now().Unix() }
nameserver/entry_test.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
func l(es Entries) Entries { func l(es Entries) Entries {
nameserver/http.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/weaveworks/weave/common/docker" "github.com/rajch/weave/common/docker"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
func (n *Nameserver) badRequest(w http.ResponseWriter, err error) { func (n *Nameserver) badRequest(w http.ResponseWriter, err error) {
nameserver/nameserver.go
+2 -2
View File
@@ -8,8 +8,8 @@ import (
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
const ( const (
nameserver/nameserver_test.go
+2 -2
View File
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
"github.com/weaveworks/weave/testing/gossip" "github.com/rajch/weave/testing/gossip"
) )
func makeNameserver(name mesh.PeerName) *Nameserver { func makeNameserver(name mesh.PeerName) *Nameserver {
net/address/address.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
// Using 32-bit integer to represent IPv4 address // Using 32-bit integer to represent IPv4 address
net/bridge.go
+6 -6
View File
@@ -12,11 +12,11 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/vishvananda/netlink" "github.com/vishvananda/netlink"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/chains" "github.com/rajch/weave/common/chains"
"github.com/weaveworks/weave/common/odp" "github.com/rajch/weave/common/odp"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
) )
/* This code implements three possible configurations to connect /* 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 "weave" is an Open vSwitch datapath, and capture/injection are as in
BridgedFastdp. Not used by default due to missing conntrack support 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 ( const (
net/if.go
+1 -1
View File
@@ -21,7 +21,7 @@ func ensureInterface(ifaceName string) (*net.Interface, error) {
ch := make(chan netlink.LinkUpdate) ch := make(chan netlink.LinkUpdate)
// NB: We do not supply (and eventually close) a 'done' channel // NB: We do not supply (and eventually close) a 'done' channel
// here since that can cause incorrect file descriptor // 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 { if err := netlink.LinkSubscribe(ch, nil); err != nil {
return nil, err return nil, err
} }
net/ipset/ipset.go
+1 -1
View File
@@ -53,7 +53,7 @@ type ipset struct {
// List of users per ipset entry. User is either a namespace or a pod. // 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 // 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: // 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{} users map[entryKey]map[UID]struct{}
} }
net/uuid.go
+1 -1
View File
@@ -6,8 +6,8 @@ import (
"net" "net"
"os" "os"
"github.com/rajch/weave/db"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/db"
) )
func getOldStyleSystemUUID() ([]byte, error) { func getOldStyleSystemUUID() ([]byte, error) {
npc/analyser.go
+1 -1
View File
@@ -7,7 +7,7 @@ import (
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
"k8s.io/apimachinery/pkg/util/intstr" "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) ( func (ns *ns) analysePolicy(policy *networkingv1.NetworkPolicy) (
npc/controller.go
+4 -4
View File
@@ -12,10 +12,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/chains" "github.com/rajch/weave/common/chains"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
"github.com/weaveworks/weave/npc/iptables" "github.com/rajch/weave/npc/iptables"
) )
type NetworkPolicyController interface { type NetworkPolicyController interface {
npc/controller_test.go
+5 -5
View File
@@ -8,9 +8,9 @@ import (
"testing" "testing"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/rajch/weave/common/chains"
"github.com/rajch/weave/net/ipset"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/weaveworks/weave/common/chains"
"github.com/weaveworks/weave/net/ipset"
coreapi "k8s.io/api/core/v1" coreapi "k8s.io/api/core/v1"
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/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) { func TestRegressionPolicyNamespaceOrdering3059(t *testing.T) {
// Test for race condition between namespace and networkpolicy events // 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{ sourceNamespace := &coreapi.Namespace{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
@@ -456,7 +456,7 @@ func TestOutOfOrderPodEvents(t *testing.T) {
require.False(t, m.entriesExist(runBarIPSetName, podIP)) 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) { func TestNewTargetSelector(t *testing.T) {
const ( const (
ingressDefaultAllowIPSetName = "weave-;rGqyMIl1HN^cfDki~Z$3]6!N" 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)) 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) { func TestIngressPolicyWithIPBlockAndPortSpecified(t *testing.T) {
const ( const (
barPodIP = "10.32.0.11" barPodIP = "10.32.0.11"
npc/ipblock.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
networkingv1 "k8s.io/api/networking/v1" networkingv1 "k8s.io/api/networking/v1"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
) )
type ipBlockSpec struct { type ipBlockSpec struct {
npc/metrics/metrics.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
var ( var (
npc/namespace.go
+4 -4
View File
@@ -10,10 +10,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/chains" "github.com/rajch/weave/common/chains"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
"github.com/weaveworks/weave/npc/iptables" "github.com/rajch/weave/npc/iptables"
) )
var errInvalidNetworkPolicyObjType = errors.New("invalid NetworkPolicy object type") var errInvalidNetworkPolicyObjType = errors.New("invalid NetworkPolicy object type")
npc/rule.go
+4 -4
View File
@@ -5,10 +5,10 @@ import (
"reflect" "reflect"
"strings" "strings"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/chains" "github.com/rajch/weave/common/chains"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
"github.com/weaveworks/weave/npc/iptables" "github.com/rajch/weave/npc/iptables"
) )
type ruleHost interface { type ruleHost interface {
npc/rule_test.go
+3 -2
View File
@@ -1,13 +1,14 @@
package npc package npc
import ( import (
"github.com/stretchr/testify/require"
"testing" "testing"
"github.com/stretchr/testify/require"
) )
func TestRegressionHandleNil3095(t *testing.T) { func TestRegressionHandleNil3095(t *testing.T) {
// Test for handling nil values // 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) rs := newRuleSpec(policyTypeIngress, nil, nil, nil, nil)
npc/selector.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
) )
type selectorSpec struct { type selectorSpec struct {
npc/ulogd/ulogd.go
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"os/exec" "os/exec"
"syscall" "syscall"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
func waitForExit(cmd *exec.Cmd) { func waitForExit(cmd *exec.Cmd) {
plugin/ipam/driver.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/docker/libnetwork/discoverapi" "github.com/docker/libnetwork/discoverapi"
"github.com/docker/libnetwork/netlabel" "github.com/docker/libnetwork/netlabel"
"github.com/weaveworks/weave/api" "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
type Ipam struct { type Ipam struct {
plugin/net/cni.go
+3 -3
View File
@@ -13,11 +13,11 @@ import (
"github.com/containernetworking/cni/pkg/types" "github.com/containernetworking/cni/pkg/types"
current "github.com/containernetworking/cni/pkg/types/100" current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/plugins/pkg/ipam" "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/netlink"
"github.com/vishvananda/netns" "github.com/vishvananda/netns"
weaveapi "github.com/weaveworks/weave/api"
weavenet "github.com/weaveworks/weave/net"
ipamplugin "github.com/weaveworks/weave/plugin/ipam"
) )
var ( var (
plugin/net/driver.go
+5 -5
View File
@@ -10,12 +10,12 @@ import (
"github.com/docker/libnetwork/types" "github.com/docker/libnetwork/types"
"golang.org/x/sys/unix" "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" "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 ( const (
plugin/net/watcher.go
+3 -3
View File
@@ -3,9 +3,9 @@ package plugin
import ( import (
"fmt" "fmt"
weaveapi "github.com/weaveworks/weave/api" weaveapi "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common/docker" "github.com/rajch/weave/common/docker"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
type watcher struct { type watcher struct {
plugin/plugin.go
+7 -7
View File
@@ -7,13 +7,13 @@ import (
"strings" "strings"
"github.com/docker/libnetwork/ipamapi" "github.com/docker/libnetwork/ipamapi"
weaveapi "github.com/weaveworks/weave/api" weaveapi "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/docker" "github.com/rajch/weave/common/docker"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
ipamplugin "github.com/weaveworks/weave/plugin/ipam" ipamplugin "github.com/rajch/weave/plugin/ipam"
netplugin "github.com/weaveworks/weave/plugin/net" netplugin "github.com/rajch/weave/plugin/net"
"github.com/weaveworks/weave/plugin/skel" "github.com/rajch/weave/plugin/skel"
) )
const ( const (
prog/kube-utils/kube_test.go
+1 -1
View File
@@ -8,7 +8,7 @@ import (
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
"k8s.io/client-go/testing" "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() var scheme = runtime.NewScheme()
prog/kube-utils/main.go
+2 -2
View File
@@ -24,8 +24,8 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
weaveapi "github.com/weaveworks/weave/api" weaveapi "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
type nodeInfo struct { type nodeInfo struct {
prog/kube-utils/peerlist.go
+1 -1
View File
@@ -10,7 +10,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
const ( const (
prog/weave-kube/weave-daemonset-k8s-1.11.yaml
+2
View File
@@ -151,6 +151,8 @@ items:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CHECKPOINT_DISABLE
value: "1"
image: 'rajchaudhuri/weave-kube:latest' image: 'rajchaudhuri/weave-kube:latest'
imagePullPolicy: Always imagePullPolicy: Always
readinessProbe: readinessProbe:
prog/weave-kube/weave-daemonset-k8s-1.8.yaml
+2
View File
@@ -148,6 +148,8 @@ items:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CHECKPOINT_DISABLE
value: "1"
image: 'rajchaudhuri/weave-kube:latest' image: 'rajchaudhuri/weave-kube:latest'
imagePullPolicy: Always imagePullPolicy: Always
readinessProbe: readinessProbe:
prog/weave-kube/weave-daemonset-k8s-1.9.yaml
+2
View File
@@ -151,6 +151,8 @@ items:
fieldRef: fieldRef:
apiVersion: v1 apiVersion: v1
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: CHECKPOINT_DISABLE
value: "1"
image: 'rajchaudhuri/weave-kube:latest' image: 'rajchaudhuri/weave-kube:latest'
imagePullPolicy: Always imagePullPolicy: Always
readinessProbe: readinessProbe:
prog/weave-npc/main.go
+7 -7
View File
@@ -19,13 +19,13 @@ import (
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/chains" "github.com/rajch/weave/common/chains"
"github.com/weaveworks/weave/net" "github.com/rajch/weave/net"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
"github.com/weaveworks/weave/npc" "github.com/rajch/weave/npc"
"github.com/weaveworks/weave/npc/metrics" "github.com/rajch/weave/npc/metrics"
"github.com/weaveworks/weave/npc/ulogd" "github.com/rajch/weave/npc/ulogd"
) )
var ( var (
prog/weaver/checkpoint.go
+1 -1
View File
@@ -8,8 +8,8 @@ import (
"syscall" "syscall"
"time" "time"
weave "github.com/rajch/weave/router"
checkpoint "github.com/weaveworks/go-checkpoint" checkpoint "github.com/weaveworks/go-checkpoint"
weave "github.com/weaveworks/weave/router"
) )
var checker *checkpoint.Checker var checker *checkpoint.Checker
prog/weaver/discovery.go
+1 -1
View File
@@ -11,7 +11,7 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/weave/ipam" "github.com/rajch/weave/ipam"
) )
// TODO: move these definitions somewhere more shareable // TODO: move these definitions somewhere more shareable
prog/weaver/http.go
+7 -7
View File
@@ -12,14 +12,14 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/mesh" "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/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"} var allConnectionStates = []string{"established", "pending", "retrying", "failed", "connecting"}
prog/weaver/main.go
+12 -12
View File
@@ -18,18 +18,18 @@ import (
"github.com/weaveworks/common/signals" "github.com/weaveworks/common/signals"
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/common/docker" "github.com/rajch/weave/common/docker"
"github.com/weaveworks/weave/db" "github.com/rajch/weave/db"
"github.com/weaveworks/weave/ipam" "github.com/rajch/weave/ipam"
"github.com/weaveworks/weave/ipam/tracker" "github.com/rajch/weave/ipam/tracker"
"github.com/weaveworks/weave/nameserver" "github.com/rajch/weave/nameserver"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
"github.com/weaveworks/weave/net/ipset" "github.com/rajch/weave/net/ipset"
"github.com/weaveworks/weave/plugin" "github.com/rajch/weave/plugin"
weaveproxy "github.com/weaveworks/weave/proxy" weaveproxy "github.com/rajch/weave/proxy"
weave "github.com/weaveworks/weave/router" weave "github.com/rajch/weave/router"
) )
var version = "unreleased" var version = "unreleased"
prog/weaver/main_test.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import ( import (
"testing" "testing"
weavetest "github.com/weaveworks/weave/testing" weavetest "github.com/rajch/weave/testing"
) )
func TestMain(t *testing.T) { func TestMain(t *testing.T) {
prog/weaver/metrics.go
+4 -4
View File
@@ -6,10 +6,10 @@ import (
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/weaveworks/weave/ipam" "github.com/rajch/weave/ipam"
"github.com/weaveworks/weave/nameserver" "github.com/rajch/weave/nameserver"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
weave "github.com/weaveworks/weave/router" weave "github.com/rajch/weave/router"
) )
func metricsHandler(router *weave.NetworkRouter, allocator *ipam.Allocator, ns *nameserver.Nameserver, dnsserver *nameserver.DNSServer) http.Handler { func metricsHandler(router *weave.NetworkRouter, allocator *ipam.Allocator, ns *nameserver.Nameserver, dnsserver *nameserver.DNSServer) http.Handler {
prog/weaver/reclaim.go
+7 -7
View File
@@ -6,14 +6,14 @@ import (
docker "github.com/fsouza/go-dockerclient" 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/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 { func a(cidr *net.IPNet) address.CIDR {
prog/weaveutil/addrs.go
+2 -2
View File
@@ -3,9 +3,9 @@ package main
import ( import (
"fmt" "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 { func containerAddrs(args []string) error {
prog/weaveutil/attach.go
+2 -2
View File
@@ -9,8 +9,8 @@ import (
"github.com/vishvananda/netns" "github.com/vishvananda/netns"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
"github.com/weaveworks/weave/proxy" "github.com/rajch/weave/proxy"
) )
func attach(args []string) error { func attach(args []string) error {
prog/weaveutil/bridge.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import ( import (
"fmt" "fmt"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func detectBridgeType(args []string) error { func detectBridgeType(args []string) error {
prog/weaveutil/cni.go
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"github.com/containernetworking/cni/pkg/version" "github.com/containernetworking/cni/pkg/version"
bv "github.com/containernetworking/plugins/pkg/utils/buildversion" bv "github.com/containernetworking/plugins/pkg/utils/buildversion"
weaveapi "github.com/weaveworks/weave/api" weaveapi "github.com/rajch/weave/api"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
ipamplugin "github.com/weaveworks/weave/plugin/ipam" ipamplugin "github.com/rajch/weave/plugin/ipam"
netplugin "github.com/weaveworks/weave/plugin/net" netplugin "github.com/rajch/weave/plugin/net"
) )
func cniNet(args []string) error { func cniNet(args []string) error {
prog/weaveutil/datapath.go
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/weaveworks/weave/common/odp" "github.com/rajch/weave/common/odp"
) )
func createDatapath(args []string) error { func createDatapath(args []string) error {
prog/weaveutil/db_flag.go
+1 -1
View File
@@ -4,7 +4,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/weaveworks/weave/db" "github.com/rajch/weave/db"
) )
const dbFlagPrefix = "flag:" const dbFlagPrefix = "flag:"
prog/weaveutil/docker_tls_args.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
) )
func dockerTLSArgs(args []string) error { func dockerTLSArgs(args []string) error {
prog/weaveutil/netcheck.go
+1 -1
View File
@@ -4,7 +4,7 @@ package main
import ( import (
"net" "net"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func netcheck(args []string) error { func netcheck(args []string) error {
prog/weaveutil/proc-addrs.go
+2 -2
View File
@@ -3,8 +3,8 @@ package main
import ( import (
"strconv" "strconv"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func processAddrs(args []string) error { func processAddrs(args []string) error {
prog/weaveutil/unique_id.go
+1 -1
View File
@@ -3,7 +3,7 @@ package main
import ( import (
"fmt" "fmt"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func uniqueID(args []string) error { func uniqueID(args []string) error {
prog/weavewait/check_network_iface.go
+2 -1
View File
@@ -1,9 +1,10 @@
//go:build iface && !mcast
// +build iface,!mcast // +build iface,!mcast
package main package main
import ( import (
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func checkNetwork() error { func checkNetwork() error {
prog/weavewait/check_network_iface_mcast.go
+2 -1
View File
@@ -1,9 +1,10 @@
//go:build iface && mcast
// +build iface,mcast // +build iface,mcast
package main package main
import ( import (
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
func checkNetwork() error { func checkNetwork() error {
proxy/common.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/fsouza/go-dockerclient" docker "github.com/fsouza/go-dockerclient"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
weavedocker "github.com/weaveworks/weave/common/docker" weavedocker "github.com/rajch/weave/common/docker"
) )
var ( var (
proxy/proxy.go
+3 -3
View File
@@ -17,9 +17,9 @@ import (
docker "github.com/fsouza/go-dockerclient" docker "github.com/fsouza/go-dockerclient"
"github.com/pkg/errors" "github.com/pkg/errors"
weaveapi "github.com/weaveworks/weave/api" weaveapi "github.com/rajch/weave/api"
weavedocker "github.com/weaveworks/weave/common/docker" weavedocker "github.com/rajch/weave/common/docker"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
const ( const (
reweave/CHANGELOG.md
+17 -1
View File
@@ -2,7 +2,23 @@
All changes made to the weave net codebase during the reweave effort will be documented in this file. 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 ### Changed
reweave/Makefile
+1 -1
View File
@@ -1,4 +1,4 @@
IMAGE_VERSION ?= 2.8.2-beta12 IMAGE_VERSION ?= 2.8.2-beta13
REGISTRY_USER ?= rajchaudhuri REGISTRY_USER ?= rajchaudhuri
ALPINE_BASEIMAGE ?= alpine:3.19.1 ALPINE_BASEIMAGE ?= alpine:3.19.1
router/fastdp.go
+3 -3
View File
@@ -14,7 +14,7 @@ import (
"github.com/weaveworks/go-odp/odp" "github.com/weaveworks/go-odp/odp"
"github.com/weaveworks/mesh" "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 // The virtual bridge accepts packets from ODP vports and the router
@@ -1322,8 +1322,8 @@ func (fastdp *FastDatapath) takeDecoder(lock *fastDatapathLock) *EthernetDecoder
// mode on the weave bridge port which attaches the datapath. Such flow is // mode on the weave bridge port which attaches the datapath. Such flow is
// identified by either: // identified by either:
// //
// * in_port == out_port, where in_port is non-vxlan vport; // - 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 // - 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. // the tunnel id is either the same or dstPeer and srcPeer are reversed.
func (fastdp *FastDatapath) isHairpinFlow(flow *odp.FlowSpec) bool { func (fastdp *FastDatapath) isHairpinFlow(flow *odp.FlowSpec) bool {
var ( var (
router/http.go
+3 -3
View File
@@ -7,9 +7,9 @@ import (
"github.com/gorilla/mux" "github.com/gorilla/mux"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/net" "github.com/rajch/weave/net"
"github.com/weaveworks/weave/net/address" "github.com/rajch/weave/net/address"
) )
func (router *NetworkRouter) HandleHTTP(muxRouter *mux.Router) { func (router *NetworkRouter) HandleHTTP(muxRouter *mux.Router) {
router/network_router.go
+3 -3
View File
@@ -9,9 +9,9 @@ import (
"github.com/weaveworks/mesh" "github.com/weaveworks/mesh"
"github.com/weaveworks/weave/common" "github.com/rajch/weave/common"
"github.com/weaveworks/weave/db" "github.com/rajch/weave/db"
weavenet "github.com/weaveworks/weave/net" weavenet "github.com/rajch/weave/net"
) )
const ( const (
testing/gossip/mocks.go
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/weaveworks/mesh" "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 // Router to convey gossip from one gossiper to another, for testing
vendor/github.com/weaveworks/mesh/gossip.go
Generated Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ type Gossip interface {
// Unicast takes []byte instead of GossipData because "to date there has // Unicast takes []byte instead of GossipData because "to date there has
// been no compelling reason [in practice] to do merging on unicast." // been no compelling reason [in practice] to do merging on unicast."
// But there may be some motivation to have unicast Mergeable; see // 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? // TODO(pb): for uniformity of interface, rather take GossipData?
GossipUnicast(dst PeerName, msg []byte) error GossipUnicast(dst PeerName, msg []byte) error