remove glide

.travis.yml

@@ -17,10 +17,3 @@ after_success:
     fi
 notifications:
   email: false
-
-addons:
-  apt:
-    sources:
-      - sourceline: 'ppa:masterminds/glide'
-    packages:
-      - glide

Makefile

@@ -15,7 +15,7 @@ else
 endif
 
 # Go version to use for builds
-GO_VERSION=1.10.3
+GO_VERSION=1.14.6
 
 # K8s version used for Makefile helpers
 K8S_VERSION=v1.6.6
@@ -69,7 +69,7 @@ ifeq ($(ARCH),amd64)
 endif
 
 ### TESTING
-test: header-check gofmt verify-glide
+test: header-check gofmt verify-modules
 	# Run the unit tests
 	# NET_ADMIN capacity is required to do some network operation
 	# SYS_ADMIN capacity is required to create network namespace
@@ -105,10 +105,9 @@ gofmt:
 		cd /go/src/github.com/coreos/flannel && \
 		! gofmt -d $(PACKAGES) 2>&1 | read'
 
-# Throw an error if `glide list` finds any errors.
-verify-glide:
-	$(if $(shell which glide),,$(error "glide not found in PATH"))
-	bash -c '! glide list 2>&1 | grep "ERROR"'
+verify-modules:
+	$(if $(shell which go),,$(error "go not found in PATH"))
+	go mod tidy
 
 gofmt-fix:
 	docker run -e CGO_ENABLED=$(CGO_ENABLED) -e GOARCH=$(ARCH) \
@@ -226,13 +225,6 @@ flannel-git:
 	ARCH=ppc64le REGISTRY=quay.io/coreos/flannel-git make clean dist/flanneld-$(TAG)-ppc64le.docker docker-push
 	ARCH=s390x REGISTRY=quay.io/coreos/flannel-git make clean dist/flanneld-$(TAG)-s390x.docker docker-push
 
-### DEVELOPING
-update-glide:
-	# go get -d -u github.com/Masterminds/glide
-	glide update --strip-vendor
-	# go get -d -u github.com/sgotti/glide-vc
-	glide vc --only-code --no-tests
-
 install:
 	# This is intended as just a developer convenience to help speed up non-containerized builds
 	# It is NOT how you install flannel

glide.lock

@@ -1,375 +0,0 @@
-hash: 4059cd0e42f61ec6a1d3e910a989dd22141611b5774464aac92ba256734d6f34
-updated: 2018-01-01T18:24:38.545866546-06:00
-imports:
-- name: cloud.google.com/go
-  version: 7c205da84d8d024a8200be93ab042357c9a70177
-  subpackages:
-  - compute/metadata
-- name: github.com/aws/aws-sdk-go
-  version: 5db34a6d9a78f5a3c6a713197aeb6bf159458211
-  subpackages:
-  - aws
-  - aws/awserr
-  - aws/awsutil
-  - aws/client
-  - aws/client/metadata
-  - aws/corehandlers
-  - aws/credentials
-  - aws/credentials/ec2rolecreds
-  - aws/credentials/endpointcreds
-  - aws/credentials/stscreds
-  - aws/defaults
-  - aws/ec2metadata
-  - aws/endpoints
-  - aws/request
-  - aws/session
-  - aws/signer/v4
-  - internal/shareddefaults
-  - private/protocol
-  - private/protocol/ec2query
-  - private/protocol/query
-  - private/protocol/query/queryutil
-  - private/protocol/rest
-  - private/protocol/xml/xmlutil
-  - service/ec2
-  - service/sts
-- name: github.com/buger/jsonparser
-  version: f4dd9f5a6b441265aefc1d44872a6f8c10f42b37
-- name: github.com/bronze1man/goStrongswanVici
-  version: 4d72634a2f113aa48347dbc7dcb14adb806b6534
-- name: github.com/coreos/etcd
-  version: 960f4604bc821241b94906da5fe7f66306a77472
-  subpackages:
-  - client
-  - clientv3
-  - pkg/fileutil
-  - pkg/pathutil
-  - pkg/tlsutil
-  - pkg/transport
-  - pkg/types
-- name: github.com/coreos/go-iptables
-  version: 47f22b0dd3355c0ba570ba12b0b8a36bf214c04b
-  subpackages:
-  - iptables
-- name: github.com/coreos/go-systemd
-  version: 48702e0da86bd25e76cfef347e2adeb434a0d0a6
-  subpackages:
-  - activation
-  - daemon
-  - journal
-- name: github.com/coreos/pkg
-  version: 3ac0863d7acf3bc44daf49afef8919af12f704ef
-  subpackages:
-  - capnslog
-  - flagutil
-- name: github.com/davecgh/go-spew
-  version: 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d
-  subpackages:
-  - spew
-- name: github.com/denverdino/aliyungo
-  version: f6cab0c35083495bd138281f0b9ca40ae2f15e19
-  subpackages:
-  - common
-  - ecs
-  - metadata
-  - util
-- name: github.com/docker/distribution
-  version: cd27f179f2c10c5d300e6d09025b538c475b0d51
-  subpackages:
-  - digest
-  - reference
-- name: github.com/emicklei/go-restful
-  version: 09691a3b6378b740595c1002f40c34dd5f218a22
-  subpackages:
-  - log
-  - swagger
-- name: github.com/ghodss/yaml
-  version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
-- name: github.com/go-ini/ini
-  version: 3d73f4b845efdf9989fffd4b4e562727744a34ba
-- name: github.com/go-openapi/jsonpointer
-  version: 46af16f9f7b149af66e5d1bd010e3574dc06de98
-- name: github.com/go-openapi/jsonreference
-  version: 13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272
-- name: github.com/go-openapi/spec
-  version: 6aced65f8501fe1217321abf0749d354824ba2ff
-- name: github.com/go-openapi/swag
-  version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72
-- name: github.com/gogo/protobuf
-  version: 909568be09de550ed094403c2bf8a261b5bb730a
-  subpackages:
-  - proto
-  - sortkeys
-- name: github.com/golang/glog
-  version: 44145f04b68cf362d9c4df2182967c2275eaefed
-- name: github.com/golang/protobuf
-  version: 4bd1920723d7b7c925de087aa32e2187708897f7
-  subpackages:
-  - jsonpb
-  - proto
-- name: github.com/google/gofuzz
-  version: 44d81051d367757e1c7c6a5a86423ece9afcf63c
-- name: github.com/gorilla/mux
-  version: 7f08801859139f86dfafd1c296e2cba9a80d292e
-- name: github.com/bhendo/go-powershell
-  version: 5e467ffeda17bce224fe913c8786e22c63f67257
-  subpackages:
-  - backend
-  - utils
-- name: github.com/howeyc/gopass
-  version: 3ca23474a7c7203e0a0a070fd33508f6efdb9b3d
-- name: github.com/imdario/mergo
-  version: 6633656539c1639d9d78127b7d47c622b5d7b6dc
-- name: github.com/jmespath/go-jmespath
-  version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-- name: github.com/joho/godotenv
-  version: 726cc8b906e3d31c70a9671c90a13716a8d3f50d
-- name: github.com/jonboulle/clockwork
-  version: 2eee05ed794112d45db504eb05aa693efd2b8b09
-- name: github.com/juju/errors
-  version: c7d06af17c68cd34c835053720b21f6549d9b0ee
-- name: github.com/juju/ratelimit
-  version: 77ed1c8a01217656d2080ad51981f6e99adaa177
-- name: github.com/mailru/easyjson
-  version: d5b7844b561a7bc640052f1b935f7b800330d7e0
-  subpackages:
-  - buffer
-  - jlexer
-  - jwriter
-- name: github.com/Microsoft/go-winio
-  version: 97e4973ce50b2ff5f09635a57e2b88a037aae829
-- name: github.com/Microsoft/hcsshim
-  version: bc49f75c72216a28ffc7443177f477aae7e61d1f
-  subpackages:
-  - internal/guid
-  - internal/hcs
-  - internal/hcserror
-  - internal/hns
-  - internal/interop
-  - internal/longpath
-  - internal/mergemaps
-  - internal/safefile
-  - internal/schema1
-  - internal/timeout
-  - internal/wclayer
-- name: github.com/PuerkitoBio/purell
-  version: 8a290539e2e8629dbc4e6bad948158f790ec31f4
-- name: github.com/PuerkitoBio/urlesc
-  version: 5bd2802263f21d8788851d5305584c82a5c75d7e
-- name: github.com/rakelkar/gonetsh
-  version: 501daadcadf88660f61cc3352bdcb26b5f8ba4ce
-  subpackages:
-  - netroute
-  - netsh
-- name: github.com/sirupsen/logrus
-  version: 3e01752db0189b9157070a0e1668a620f9a85da2
-- name: github.com/spf13/pflag
-  version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5
-- name: github.com/ugorji/go
-  version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74
-  subpackages:
-  - codec
-- name: github.com/vishvananda/netlink
-  version: fe3b5664d23a11b52ba59bece4ff29c52772a56b
-  subpackages:
-  - nl
-- name: github.com/vishvananda/netns
-  version: 54f0e4339ce73702a0607f49922aaa1e749b418d
-- name: golang.org/x/crypto
-  version: 1351f936d976c60a0a48d728281922cf63eafb8d
-  subpackages:
-  - bcrypt
-  - blowfish
-  - ssh/terminal
-- name: golang.org/x/net
-  version: f2499483f923065a842d38eb4c7f1927e6fc6e6d
-  subpackages:
-  - context
-  - context/ctxhttp
-  - http2
-  - http2/hpack
-  - idna
-  - lex/httplex
-- name: golang.org/x/oauth2
-  version: 5432cc9688e6250a0dd8f5a5f4c781d92b398be6
-  subpackages:
-  - google
-  - internal
-  - jws
-  - jwt
-- name: golang.org/x/sys
-  version: d5840adf789d732bc8b00f37b26ca956a7cc8e79
-  subpackages:
-  - unix
-  - windows
-- name: golang.org/x/text
-  version: 2910a502d2bf9e43193af9d68ca516529614eed3
-  subpackages:
-  - cases
-  - internal/tag
-  - language
-  - runes
-  - secure/bidirule
-  - secure/precis
-  - transform
-  - unicode/bidi
-  - unicode/norm
-  - width
-- name: google.golang.org/api
-  version: e6586c9293b9d514c7f5d5076731ec977cff1be6
-  subpackages:
-  - compute/v1
-  - gensupport
-  - googleapi
-  - googleapi/internal/uritemplates
-- name: google.golang.org/appengine
-  version: 4f7eeb5305a4ba1966344836ba4af9996b7b4e05
-  subpackages:
-  - internal
-  - internal/app_identity
-  - internal/base
-  - internal/datastore
-  - internal/log
-  - internal/modules
-  - internal/remote_api
-  - internal/urlfetch
-  - urlfetch
-- name: gopkg.in/inf.v0
-  version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
-- name: gopkg.in/yaml.v2
-  version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
-- name: k8s.io/apimachinery
-  version: 9603df80256c35a1dd4bc3037ed9690737af941b
-  subpackages:
-  - pkg/api/errors
-  - pkg/api/meta
-  - pkg/api/resource
-  - pkg/apimachinery
-  - pkg/apimachinery/announced
-  - pkg/apimachinery/registered
-  - pkg/apis/meta/v1
-  - pkg/apis/meta/v1/unstructured
-  - pkg/conversion
-  - pkg/conversion/queryparams
-  - pkg/fields
-  - pkg/labels
-  - pkg/openapi
-  - pkg/runtime
-  - pkg/runtime/schema
-  - pkg/runtime/serializer
-  - pkg/runtime/serializer/json
-  - pkg/runtime/serializer/protobuf
-  - pkg/runtime/serializer/recognizer
-  - pkg/runtime/serializer/streaming
-  - pkg/runtime/serializer/versioning
-  - pkg/selection
-  - pkg/types
-  - pkg/util/diff
-  - pkg/util/errors
-  - pkg/util/framer
-  - pkg/util/intstr
-  - pkg/util/json
-  - pkg/util/mergepatch
-  - pkg/util/net
-  - pkg/util/rand
-  - pkg/util/runtime
-  - pkg/util/sets
-  - pkg/util/strategicpatch
-  - pkg/util/validation
-  - pkg/util/validation/field
-  - pkg/util/wait
-  - pkg/util/yaml
-  - pkg/version
-  - pkg/watch
-  - third_party/forked/golang/json
-  - third_party/forked/golang/reflect
-- name: k8s.io/client-go
-  version: a95edf803628a1bba60fb59af594fdddec9a0f8a
-  subpackages:
-  - discovery
-  - kubernetes
-  - kubernetes/scheme
-  - kubernetes/typed/apps/v1beta1
-  - kubernetes/typed/authentication/v1
-  - kubernetes/typed/authentication/v1beta1
-  - kubernetes/typed/authorization/v1
-  - kubernetes/typed/authorization/v1beta1
-  - kubernetes/typed/autoscaling/v1
-  - kubernetes/typed/autoscaling/v2alpha1
-  - kubernetes/typed/batch/v1
-  - kubernetes/typed/batch/v2alpha1
-  - kubernetes/typed/certificates/v1beta1
-  - kubernetes/typed/core/v1
-  - kubernetes/typed/extensions/v1beta1
-  - kubernetes/typed/policy/v1beta1
-  - kubernetes/typed/rbac/v1alpha1
-  - kubernetes/typed/rbac/v1beta1
-  - kubernetes/typed/settings/v1alpha1
-  - kubernetes/typed/storage/v1
-  - kubernetes/typed/storage/v1beta1
-  - listers/core/v1
-  - pkg/api
-  - pkg/api/install
-  - pkg/api/v1
-  - pkg/apis/apps
-  - pkg/apis/apps/install
-  - pkg/apis/apps/v1beta1
-  - pkg/apis/authentication
-  - pkg/apis/authentication/install
-  - pkg/apis/authentication/v1
-  - pkg/apis/authentication/v1beta1
-  - pkg/apis/authorization
-  - pkg/apis/authorization/install
-  - pkg/apis/authorization/v1
-  - pkg/apis/authorization/v1beta1
-  - pkg/apis/autoscaling
-  - pkg/apis/autoscaling/install
-  - pkg/apis/autoscaling/v1
-  - pkg/apis/autoscaling/v2alpha1
-  - pkg/apis/batch
-  - pkg/apis/batch/install
-  - pkg/apis/batch/v1
-  - pkg/apis/batch/v2alpha1
-  - pkg/apis/certificates
-  - pkg/apis/certificates/install
-  - pkg/apis/certificates/v1beta1
-  - pkg/apis/extensions
-  - pkg/apis/extensions/install
-  - pkg/apis/extensions/v1beta1
-  - pkg/apis/policy
-  - pkg/apis/policy/install
-  - pkg/apis/policy/v1beta1
-  - pkg/apis/rbac
-  - pkg/apis/rbac/install
-  - pkg/apis/rbac/v1alpha1
-  - pkg/apis/rbac/v1beta1
-  - pkg/apis/settings
-  - pkg/apis/settings/install
-  - pkg/apis/settings/v1alpha1
-  - pkg/apis/storage
-  - pkg/apis/storage/install
-  - pkg/apis/storage/v1
-  - pkg/apis/storage/v1beta1
-  - pkg/util
-  - pkg/util/parsers
-  - pkg/version
-  - rest
-  - rest/watch
-  - tools/auth
-  - tools/cache
-  - tools/clientcmd
-  - tools/clientcmd/api
-  - tools/clientcmd/api/latest
-  - tools/clientcmd/api/v1
-  - tools/metrics
-  - transport
-  - util/cert
-  - util/clock
-  - util/flowcontrol
-  - util/homedir
-  - util/integer
-- name: k8s.io/utils
-  version: 0ab3217ce272697eb60feb79a613a86a2fab7918
-  subpackages:
-  - exec
-testImports: []

glide.yaml

@@ -1,70 +0,0 @@
-package: github.com/coreos/flannel
-import:
-- package: github.com/aws/aws-sdk-go
-  version: ^1.6.14
-  subpackages:
-  - aws
-  - aws/awserr
-  - aws/ec2metadata
-  - aws/session
-  - service/ec2
-- package: github.com/coreos/etcd
-  version: 3.1.x
-  subpackages:
-  - client
-  - clientv3
-  - pkg/transport
-- package: github.com/coreos/go-iptables
-  subpackages:
-    - iptables
-  version: ~0.4.0
-- package: github.com/coreos/go-systemd
-  subpackages:
-  - activation
-  - daemon
-- package: github.com/coreos/pkg
-  version: v3
-  subpackages:
-  - flagutil
-- package: github.com/golang/glog
-- package: github.com/gorilla/mux
-  version: ^1.3.0
-- package: github.com/jonboulle/clockwork
-  version: ^0.1.0
-- package: github.com/vishvananda/netlink
-  subpackages:
-  - nl
-- package: golang.org/x/net
-  subpackages:
-  - context
-- package: golang.org/x/oauth2
-  subpackages:
-  - google
-- package: google.golang.org/api
-  subpackages:
-  - compute/v1
-  - googleapi
-- package: k8s.io/client-go
-  version: release-3.0
-  subpackages:
-  - kubernetes
-  - listers/core/v1
-  - pkg/api/v1
-  - rest
-  - tools/cache
-- package: k8s.io/apimachinery
-  subpackages:
-  - pkg/apis/meta/v1
-  - pkg/runtime
-  - pkg/util/wait
-  - pkg/watch
-- package: github.com/joho/godotenv
-  version: v1.1
-- package: github.com/bronze1man/goStrongswanVici
-  version: 4d72634a2f113aa48347dbc7dcb14adb806b6534
-- package: github.com/Microsoft/hcsshim
-- package: github.com/Microsoft/go-winio
-  version: v0.4.11
-- package: github.com/sirupsen/logrus
-  version: v1.0.6
-- package: github.com/buger/jsonparser