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.

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

Adding tuning plugin #519

Merged
merged 1 commit into from
May 17, 2018

Conversation

eranreshef
Copy link
Contributor

@eranreshef eranreshef commented May 15, 2018

Description

Adding the tuning plugin to be part of the image.

Todos

  • Documentation ?

Release Note

Add the tuning plugin to the calico/cni image

@CLAassistant
Copy link

CLAassistant commented May 15, 2018

CLA assistant check
All committers have signed the CLA.

tmjd
tmjd previously approved these changes May 16, 2018
Copy link
Member

@tmjd tmjd left a comment

Choose a reason for hiding this comment

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

LGTM. Seems pretty straightforward.
@caseydavenport WDYT?

@tmjd tmjd dismissed their stale review May 16, 2018 14:06

I don't think I should have the power to make this PR mergable.

@tmjd
Copy link
Member

tmjd commented May 16, 2018

LGTM. Seems pretty straightforward.
@caseydavenport WDYT?
(Casey I approved and then it looked like the PR was mergable and I didn't want this to get merged before you could take a look, so I dismissed it.)

Copy link
Member

@caseydavenport caseydavenport left a comment

Choose a reason for hiding this comment

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

lgtm.

Longer term I wonder if we should push for an upstream cni distribution container so we don't need to fill our CNI image with extra binaries, but given we've already started down this path...

@caseydavenport caseydavenport merged commit 1561548 into projectcalico:master May 17, 2018
@caseydavenport caseydavenport added this to the Calico v3.2.0 milestone May 17, 2018
@eranreshef
Copy link
Contributor Author

eranreshef commented May 30, 2018

I upgraded my cluster's calico deployment to v3.1.2 and the tuning plugin is missing from opt/cni/bin . Did I miss some file that needed to be modified in the PR or will it be part of 3.2.0 ?

@caseydavenport
Copy link
Member

@eranreshef this PR went into master, which means it will be a part of v3.2.0 (master is, in general, the next minor release)

If you'd like to get it in an earlier release, you can submit a cherry-pick against the release-v3.1 branch. Sorry for the confusion!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants