Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

bump cni and netlink. adapt rkt #1476

Merged
merged 4 commits into from Sep 25, 2015
Merged

bump cni and netlink. adapt rkt #1476

merged 4 commits into from Sep 25, 2015

Conversation

steveej
Copy link
Contributor

@steveej steveej commented Sep 24, 2015

Fixes #1458.
Unblocks #1364.

@steveej
godeps: bump CNI
41412ed
@steveej
godeps: bump netlink
3698a00
@steveej
*: adapt to cni changes
abb6922 
- use new cni import paths
- remove usage of deprecated ipam plugin host-local-ptp in default network
  configurations
- remove uneeded symlink handling in the build system
@steveej
improve tests and adapt to cni/netlink bumps
966c4c8 
- remove usage of deprecated host-local-ptp ipam plugin
- more robust heuristics for finding a suitable interface and address to use with
the connectivity tests
@steveej steveej self-assigned this Sep 24, 2015
@steveej steveej added this to the v0.9.0 milestone Sep 24, 2015
@eyakubovich
Copy link
Contributor

LGTM

steveej added a commit that referenced this pull request Sep 25, 2015
@steveej
Merge pull request #1476 from steveeJ/bump-cni
cb9f315 
bump cni and netlink. adapt rkt
@steveej steveej merged commit cb9f315 into rkt:master Sep 25, 2015
@jonboulle
Copy link
Contributor

@eyakubovich @steveej Please be careful with the CNI bumps. This is the second time we've added binaries to the repository that shouldn't be there.

 ; git ls-files | xargs ls -l | sort -n -k5 | tail
-rw-rw-r--. 1 jon jon  260660 Oct  2 16:45 Godeps/_workspace/src/github.com/cznic/ql/testdata.log
-rw-rw-r--. 1 jon jon  327438 Oct  2 16:45 Godeps/_workspace/src/github.com/cznic/ql/testdata.ql
-rw-rw-r--. 1 jon jon  371560 Sep 17 12:00 Godeps/_workspace/src/github.com/cznic/mathutil/tables.go
-rw-rw-r--. 1 jon jon 3294992 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/host-local/host-local
-rw-rw-r--. 1 jon jon 3969288 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/meta/flannel/flannel
-rw-rw-r--. 1 jon jon 4130064 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/main/bridge/bridge
-rw-rw-r--. 1 jon jon 4207784 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/main/macvlan/macvlan
-rw-rw-r--. 1 jon jon 4694664 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/main/ipvlan/ipvlan
-rw-rw-r--. 1 jon jon 4767656 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/main/ptp/ptp
-rw-rw-r--. 1 jon jon 8366056 Oct  2 16:45 Godeps/_workspace/src/github.com/appc/cni/plugins/ipam/dhcp/dhcp

@alban alban mentioned this pull request Oct 9, 2015
Open
@steveej steveej deleted the bump-cni branch October 21, 2015 08:16
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@steveej steveej

Labels
area/developer tooling area/networking component/stage1 depends-on/cni depends-on/external needs/review
Projects
None yet
Milestone
v0.9.0
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@steveej @eyakubovich @jonboulle