Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump dependencies #29

Merged
merged 9 commits into from
Sep 17, 2020
Merged

Bump dependencies #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d2803f9
Bump github.com/aktau/github-release to v0.8.1
Sep 16, 2020
ff42e09
Bump github.com/containernetworking/cni to v0.8.0
Sep 16, 2020
5f972ba
Bump kubernetes to v0.19.1
Sep 16, 2020
fca80cb
make vendor for new go.mod
Sep 16, 2020
7ab0f7b
adjust e2e tests to client-go 1.18
Sep 16, 2020
d7bd235
Fix test verbose flag setting
Sep 16, 2020
0e45035
Flags should be parsed in BeforeSuite
Sep 16, 2020
08934da
Update manifests based on new template
Sep 16, 2020
fe13662
Bump Go version to 1.13
Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions automation/check-patch.setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export PATH=${GOPATH}/bin:${GOROOT}/bin:${PATH}
export GOBIN=${GOROOT}/bin/
mkdir -p $GOBIN

echo 'Install Go 1.12'
export GIMME_GO_VERSION=1.12
echo 'Install Go 1.13'
export GIMME_GO_VERSION=1.13
GIMME=/tmp/macvtap-cni/go/gimme
mkdir -p $GIMME
curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | HOME=${GIMME} bash >> ${GIMME}/gimme.sh
Expand Down
75 changes: 40 additions & 35 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,54 @@ module github.com/kubevirt/macvtap-cni
go 1.13

require (
github.com/aktau/github-release v0.7.2
github.com/containernetworking/cni v0.7.1
github.com/aktau/github-release v0.8.1
github.com/containernetworking/cni v0.8.0
github.com/containernetworking/plugins v0.8.5
github.com/dustin/go-humanize v1.0.0 // indirect
github.com/github-release/github-release v0.8.1 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/kubevirt/device-plugin-manager v1.14.0
github.com/onsi/ginkgo v1.11.0
github.com/onsi/gomega v1.8.1
github.com/inconshreveable/log15 v0.0.0-20200109203555-b30bc20e4fd1 // indirect
github.com/kevinburke/rest v0.0.0-20200429221318-0d2892b400f8 // indirect
github.com/kubevirt/device-plugin-manager v1.18.8
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/onsi/ginkgo v1.14.0
github.com/onsi/gomega v1.10.1
github.com/tomnomnom/linkheader v0.0.0-20180905144013-02ca5825eb80 // indirect
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df
github.com/vishvananda/netns v0.0.0-20200520041808-52d707b772fe
github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 // indirect
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc
golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9
google.golang.org/grpc v1.26.0
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/client-go v0.0.0
k8s.io/kubernetes v0.0.0-00010101000000-000000000000
golang.org/x/net v0.0.0-20200822124328-c89045814202
golang.org/x/tools v0.0.0-20200616133436-c1934b75d054
google.golang.org/grpc v1.31.0
k8s.io/api v0.19.1
k8s.io/apimachinery v0.19.1
k8s.io/client-go v0.19.1
k8s.io/kubelet v0.18.8
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is kubelet older than kubernetes here? And why is it required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deviceplugin has moved under kubelet
With v0.19.1 there is an error:

pkg/deviceplugin/lister.go:168:31: cannot use NewMacvtapDevicePlugin(c.Name, c.Master, c.Mode, c.Capacity, ml.NetNsPath) (type *macvtapDevicePlugin) as type dpm.PluginInterface in return argument:
	*macvtapDevicePlugin does not implement dpm.PluginInterface (missing GetPreferredAllocation method)

Probably related to device scheduler in 1.19.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puff, we may need to bump that on device-plugin-manager repo... But that can wait for a follow-up, let's not get even deeper into this. Ack, thanks

)

// Pinned to kubernetes-1.15.4
// Pinned to kubernetes-1.19.1
replace (
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
k8s.io/kubernetes => k8s.io/kubernetes v1.15.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
golang.org/x/text => golang.org/x/text v0.3.3
k8s.io/api => k8s.io/api v0.19.1
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.1
k8s.io/apimachinery => k8s.io/apimachinery v0.19.1
k8s.io/apiserver => k8s.io/apiserver v0.19.1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.1
k8s.io/client-go => k8s.io/client-go v0.19.1
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.1
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.1
k8s.io/code-generator => k8s.io/code-generator v0.19.1
k8s.io/component-base => k8s.io/component-base v0.19.1
k8s.io/cri-api => k8s.io/cri-api v0.19.1
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.1
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.1
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.1
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.1
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.1
k8s.io/kubelet => k8s.io/kubelet v0.18.8
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.1
k8s.io/metrics => k8s.io/metrics v0.19.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.1
vbom.ml/util => github.com/fvbommel/util v0.0.0-20180919145318-efcd4e0f9787
)
Loading