Do not include the default CNI config by default #3441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
cncf-cla: yes
|
Can one of the admins verify this patch? |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: brb If they are not already assigned, you can assign the PR to them by writing The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
brb
force-pushed
the
2907-no-cni-conf-by-default
branch
from
b12f6ee to
89f2607
Compare
tstromberg
approved these changes
Dec 18, 2018
|
@minikube-bot OK to test |
|
The CI failures seem to be unrelated to my changes. |
brb
force-pushed
the
2907-no-cni-conf-by-default
branch
from
89f2607 to
1252ad9
Compare
Previously, minikube has been shipped with the default CNI config (/etc/cni/net.d/k8s.conf) in its rootfs. This complicated a lot when using a custom CNI plugin, as the default config was picked by kubelet before the custom CNI plugin has installed its own CNI config. So, the end result was that some Pods were attached to a network defined in the default config, and some got managed by the custom plugin. This commit introduces the flag "--enable-default-cni" to "minikube start" to trigger the provisioning of the default CNI config. Signed-off-by: Martynas Pumputis <m@lambda.lt>
As per kubernetes/kubernetes#32151, kubelet doesn't search for CNI configs in /usr/libexec/kubernetes/kubelet-plugins/net/exec/ by default anymore. Signed-off-by: Martynas Pumputis <m@lambda.lt>
|
Fixed the merge conflicts. |
brb
added a commit
to brb/website
that referenced
this pull request
Jan 24, 2019
Since minikube v0.33.0 the default CNI config is not being provisioned by default (kubernetes/minikube#3441). Therefore, we need to pass `--enable-default-cni` when starting minikube with an alternative container runtime. This commit
brb
added a commit
to brb/website
that referenced
this pull request
Jan 24, 2019
Since minikube v0.33.0 the default CNI config is not being provisioned by default (kubernetes/minikube#3441). Therefore, we need to pass `--enable-default-cni` when starting minikube.
brb
added a commit
to brb/website
that referenced
this pull request
Jan 24, 2019
Since minikube v0.33.0 the default CNI config is not being provisioned by default (kubernetes/minikube#3441). Therefore, we need to pass `--enable-default-cni` when starting minikube.
brb
added a commit
to brb/kubevirt.github.io
that referenced
this pull request
Jan 24, 2019
Since minikube v0.33.0 the default CNI config is not being provisioned by default (kubernetes/minikube#3441). Therefore, we need to pass `--enable-default-cni` when starting minikube.
k8s-ci-robot
pushed a commit
to kubernetes/website
that referenced
this pull request
Jan 31, 2019
Since minikube v0.33.0 the default CNI config is not being provisioned by default (kubernetes/minikube#3441). Therefore, we need to pass `--enable-default-cni` when starting minikube.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, minikube has been shipped with the default CNI config (
/etc/cni/net.d/k8s.conf) in its rootfs. This complicated a lot when using a custom CNI plugin, as the default config was picked by kubelet before the custom CNI plugin has installed its own CNI config. So, the end result was that some Pods were attached to a network defined in the default config, and some got managed by the custom plugin.This PR:
--enable-default-cnitominikube startto trigger the provisioning of the default CNI config./usr/libexec/kubernetes/kubelet-plugins/net/exec/k8s.conf.If this PR gets merged, https://kubernetes.io/docs/setup/minikube/#alternative-container-runtimes needs to be updated as well.
Fixes #2907.