-
Notifications
You must be signed in to change notification settings - Fork 40k
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
Ubuntu CNI support #21072
Ubuntu CNI support #21072
Conversation
Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist") If this message is too spammy, please complain to ixdy. |
1 similar comment
Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist") If this message is too spammy, please complain to ixdy. |
6585c93
to
382cc25
Compare
Labelling this PR as size/M |
d981557
to
e15058f
Compare
ok to test |
# list of their pathnames (relative to kubernetes/cluster). | ||
|
||
export CNI_PLUGIN_CONF="" | ||
export CNI_PLUGIN_EXES="" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm expected to manually edit this file before I execute it to set CNI_PLUGIN_*
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You are expected to edit those lines (manually or with automation) if you want to use a CNI plugin instead of Flannel.
Now that you mention it, I see it would be better to use defaulting here, so that those envars could be set outside the script. I will change that.
GCE e2e test build/test passed for commit e15058fe989fadbb22d96112a6ceb1e4df5d7108. |
The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label? |
e15058f
to
31e27a1
Compare
GCE e2e test build/test passed for commit 31e27a19800b7794cd9d55907a9ee3bd390dc9b1. |
932ef91
to
825f2d8
Compare
GCE e2e test build/test passed for commit 825f2d8608754409563f565a85492ba47ffaf161. |
GCE e2e test build/test passed for commit 937e9412796cfdc4ed973828c03484ac7f6659a9. |
f4cac5d
to
fe7efc1
Compare
GCE e2e test build/test passed for commit f4cac5dde390a339caece06cdc8d4e33aa673f2b. |
This is a work in progress, not ready for merge yet. |
GCE e2e test build/test passed for commit fe7efc180ae9085f6ebe817001ab16a2d97388a4. |
GCE e2e test build/test passed for commit 7f83398e4282e39fea24cab939c86992135d74b7. |
9cf34bc
to
99e5e7c
Compare
GCE e2e build/test failed for commit 9cf34bc3bdc7b425cd2fd71aeca572db8e47d1f9. |
GCE e2e build/test failed for commit 99e5e7c262e028a32dfbb4678841bea3dc52f360. |
@@ -231,6 +231,11 @@ EOF | |||
} | |||
|
|||
function create-kubelet-opts() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a slight maintainence headache. Can you move this function into hack/lib and re-use it from local-up-cluster? That would kill 2 birds with 1 stone, and people who invoke local-up (>>number of people who invoke ubuntu setup) will be aware when it's broken.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My ambition here was only to take the first baby step, which is to add CNI support to the Ubuntu scripting. My plan was to think bigger after that is accomplished. I myself have not been using local-up-cluster and am not familiar with it. Do we really need to take the bigger step right out of the gate?
@MikeSpreitzer high order bit is I'd really like to streamline this with local-up-cluster and give that the ability to handle CNI plugins as well, because that's used by a wider population and so less likely to break silently. Optionally, it would be cool if I could just run CNI plugins that were auto installed from a tarball at a url (https://github.com/appc/cni/releases/tag/v0.1.0 perhaps?). |
@resouer as defacto maintainer of ubuntu install |
Regarding local-up-cluster.sh, I see that it does not now share a lot with the cluster/ubuntu scripting, but I think @bprashanth you are saying you would like to change that. While that may be a laudatory goal, it seems to me to be a separate project from adding CNI support. Perhaps you are saying the unification project should come first. I will not object if it happens quickly, but that might have to be done by other hands than mine since I am new to all this. @resouer what do you think? |
828271a
to
2224629
Compare
I have added (1) comments documenting several functions in util.sh and (2) sanity checking of the new CNI configuration envars, as requested. |
GCE e2e test build/test passed for commit 2224629. |
We're talking about sharing code in a common library. Any number of providers can use it. Local-up-cluster is just the most common script. Did it not work, or just too much to refactor? it's ok to defer if that's the case |
I did not try a refactoring. I'm not sure what makes sense. Are you suggesting to move the |
GCE e2e test build/test passed for commit 6b8e7e1. |
@bprashanth ? |
LGTM. Beware that ther's a pretty high chance this will drift out of sync as we start making modifications to CNI integration for 1.3, unless you pay close attention to it. If you found a way to share the CNI parts with local-up-cluster, many more people will pay attention to keeping it in sync, but that can easily come in a follow up pr. |
@k8s-bot test this Tests are more than 48 hours old. Re-running tests. |
GCE e2e build/test passed for commit 6b8e7e1. |
Automatic merge from submit-queue |
Auto commit by PR queue bot
@bprashanth - thanks for the heads-up and the progress. |
Generalize cluster/ubuntu scripting to support either Flannel or CNI networking.
#20292