This repository has been archived by the owner on Sep 24, 2021. It is now read-only.
Support weave network plugin #217
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
the
cncf-cla: yes
|
This change is |
|
/cc @resouer |
resouer
reviewed
Aug 23, 2017
pkg/hyper/sandbox.go
Outdated
| @@ -77,15 +77,20 @@ func (h *Runtime) RunPodSandbox(config *kubeapi.PodSandboxConfig) (string, error | |||
| "portMappings": portMappingsParam, | |||
| } | |||
| podId := userpod.Id | |||
| _, err = h.netPlugin.SetUpPod(netNsPath, podId, config.GetMetadata(), config.GetAnnotations(), capabilities) | |||
| sandboxID := podId | |||
| // workaroud for weave netwprk plugin because it creates a veth pair based on a truncated sandboxID. | |||
resouer
reviewed
Aug 23, 2017
pkg/hyper/sandbox.go
Outdated
| @@ -291,7 +296,12 @@ func (h *Runtime) StopPodSandbox(podSandboxID string) error { | |||
| } | |||
|
|
|||
| // 4: tear down the cni network. | |||
| err = h.netPlugin.TearDownPod(netNsPath, podSandboxID, status.GetMetadata(), status.GetAnnotations(), capabilities) | |||
| sandboxID := podSandboxID | |||
| // workaroud for weave netwprk plugin because it creates a veth pair based on a truncated sandboxID. | |||
To use weave network plugin, run kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')"
|
@resouer Fixed typo. PTAL |
|
/lgtm |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fix #216.
To use weave network plugin, run
kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')"