8000 Bump to v0.6.0 by klausenbusk · Pull Request #3 · coreos/flannel-cni · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Sep 21, 2023. It is now read-only.

Bump to v0.6.0 #3

Merged
merged 1 commit into from
Aug 23, 2017
Merged

Bump to v0.6.0 #3

merged 1 commit into from
Aug 23, 2017

Conversation

klausenbusk
Copy link
Contributor

No description provided.

This was referenced Aug 19, 2017
Closed
Merged
@dghubble dghubble self-requested a review August 22, 2017 23:13
dghubble
dghubble reviewed Aug 22, 2017
View reviewed changes
Copy link
Member
@dghubble dghubble left a comment

Choose a reason for hiding this comment

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

The vlan plugin is the only one not copied over, let's include it too. Dockerfile: ADD dist/vlan /opt/cni/bin/vlan.

Tested this on a Kubernetes cluster (bootkube) and I haven't found any issues yet.

@klausenbusk
Copy link
Contributor Author

The vlan plugin is the only one not copied over, let's include it too. Dockerfile: ADD dist/vlan /opt/cni/bin/vlan.

Fixed, is there any reason why we copy every binary individually? I just replaced all the ADD lines in the Dockerfile with:

ADD dist/ /opt/cni/bin/

Is there any issue with that approach?

@dghubble
Copy link
Member

Believe this includes sample now

@klausenbusk
Copy link
Contributor Author

Believe this includes sample now

I think it is more clean to remove it afterwards (?) (less lines), I just tried changing the Dockerfile so it use Docker new multi-stage feature, it make build-image.sh less important.

@dghubble
Copy link
Member
dghubble commented Aug 23, 2017 •
edited
Loading

We don't need all these changes in this PR. The goal is to bump the CNI version and just not forget the vlan plugin. Changing the build process shouldn't happen here. Can you revert back toward the original please.

@dghubble
Copy link
Member

Thanks!

@dghubble dghubble merged commit 5a06b2b into coreos:master Aug 23, 2017
@klausenbusk
Copy link
Contributor Author

I have opened a new PR with the build changes: #7
948C

@klausenbusk klausenbusk deleted the v0.6.0 branch August 23, 2017 20:44
@klausenbusk klausenbusk mentioned this pull request Aug 24, 2017
Merged
@dghubble dghubble mentioned this pull request Aug 29, 2017
Merged
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@dghubble dghubble dghubble approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@klausenbusk @dghubble
0