Go modules

Documentation/running.md

@@ -128,8 +128,3 @@ As such, `flanneld` can be restarted (even to do an upgrade) without disturbing
 However in the case of `vxlan` backend, this needs to be done within a few seconds as ARP entries can start to timeout requiring the flannel daemon to refresh them.
 
 Also, to avoid interruptions during restart, the configuration must not be changed (e.g. VNI, --iface values).
-
-
-[coreos-etcd]: https://github.com/coreos/etcd/blob/master/Documentation/dev-guide/local_cluster.md
-[configuring-flannel]: https://coreos.com/docs/cluster-management/setup/flannel-config/
-[leases]: reservations.md

README.md

@@ -75,7 +75,7 @@ Flannel is under the Apache 2.0 license. See the [LICENSE][license] file for det
 
 [calico]: http://www.projectcalico.org
 [pod-cidr]: https://kubernetes.io/docs/admin/kubelet/
-[etcd]: https://github.com/coreos/etcd
+[etcd]: https://go.etcd.io/etcd/v3
 [contributing]: CONTRIBUTING.md
 [license]: https://github.com/flannel-io/flannel/blob/master/LICENSE
 [milestones]: https://github.com/flannel-io/flannel/milestones

backend/wireguard/device.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 // Copyright 2021 flannel authors

bill-of-materials.json

@@ -15,7 +15,7 @@
 		"confidence": 1
 	},
 	{
-		"project": "github.com/coreos/etcd",
+		"project": "go.etcd.io/etcd/v3",
 		"license": "Apache License 2.0",
 		"confidence": 1
 	},

go.mod

@@ -1,37 +1,88 @@
 module github.com/flannel-io/flannel
 
-go 1.16
+go 1.17
+
+replace google.golang.org/grpc => google.golang.org/grpc v1.29.0
 
 require (
-	github.com/Microsoft/hcsshim v0.8.6
-	github.com/aws/aws-sdk-go v1.12.54
+	github.com/Microsoft/hcsshim v0.9.2
+	github.com/aws/aws-sdk-go v1.15.11
 	github.com/bronze1man/goStrongswanVici v0.0.0-20201105010758-936f38b697fd
-	github.com/containernetworking/plugins v0.8.6
-	github.com/coreos/etcd v3.1.11+incompatible
-	github.com/coreos/go-iptables v0.4.5
-	github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7
-	github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf
-	github.com/denverdino/aliyungo v0.0.0-20170629053852-f6cab0c35083
+	github.com/containernetworking/plugins v0.9.1
+	github.com/coreos/go-iptables v0.5.0
+	github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
+	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
+	github.com/denverdino/aliyungo v0.0.0-20190125010748-a747050bb1ba
 	github.com/go-ini/ini v1.28.1 // indirect
-	github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
+	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/google/btree v1.0.1 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
 	github.com/joho/godotenv v0.0.0-20161216230537-726cc8b906e3
-	github.com/jonboulle/clockwork v0.1.0
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
+	github.com/jonboulle/clockwork v0.2.2
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_golang v1.11.0 // indirect
 	github.com/smartystreets/goconvey v1.6.4 // indirect
-	github.com/stretchr/testify v1.6.1 // indirect
+	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/tencentcloud/tencentcloud-sdk-go v1.0.67
-	github.com/ugorji/go v0.0.0-20170107133203-ded73eae5db7 // indirect
-	github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf
-	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc
+	github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
+	github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852
+	github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae
+	go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
+	go.uber.org/zap v1.17.0 // indirect
 	golang.org/x/net v0.0.0-20211020060615-d418f374d309
-	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
+	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20211022192229-f1f626090e3b // indirect
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211019185142-5be1d6054c42
-	google.golang.org/api v0.15.0
-	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	k8s.io/api v0.19.5
-	k8s.io/apimachinery v0.19.5
-	k8s.io/client-go v0.19.5
+	google.golang.org/api v0.22.0
+	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect
+	k8s.io/api v0.20.6
+	k8s.io/apimachinery v0.20.6
+	k8s.io/client-go v0.20.6
 	k8s.io/klog v1.0.0
 )
+
+require (
+	cloud.google.com/go v0.57.0 // indirect
+	github.com/Microsoft/go-winio v0.4.17 // indirect
+	github.com/containerd/cgroups v1.0.1 // indirect
+	github.com/coreos/go-semver v0.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-logr/logr v0.2.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.0.5 // indirect
+	github.com/googleapis/gnostic v0.4.1 // indirect
+	github.com/hashicorp/golang-lru v0.5.1 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7 // indirect
+	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
+	github.com/json-iterator/go v1.1.11 // indirect
+	github.com/mdlayher/genetlink v1.0.0 // indirect
+	github.com/mdlayher/netlink v1.4.1 // indirect
+	github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	go.opencensus.io v0.22.3 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+	golang.org/x/text v0.3.6 // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/grpc v1.40.0 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	k8s.io/klog/v2 v2.4.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect
+	k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.0.3 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
+)