add k8s-pure cni #67
Merged
add k8s-pure cni #67
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
|
Tests failed. |
Signed-off-by: forrestchen <forrestchen@tencent.com>
|
Fixed |
Signed-off-by: forrestchen <forrestchen@tencent.com>
ChenLingPeng
force-pushed
the
pure
branch
2 times, most recently
from
b14d6bf
to
a10c266
Compare
Signed-off-by: forrestchen <forrestchen@tencent.com>
chenchun
reviewed
Apr 24, 2020
| @@ -137,6 +137,9 @@ func CmdAdd(cmdArgs *skel.CmdArgs, networkInfos []*NetworkInfo) (types.Result, e | |||
| for idx, networkInfo := range networkInfos { | |||
| //append additional args from network info | |||
| cmdArgs.Args = strings.TrimRight(fmt.Sprintf("%s;%s", cmdArgs.Args, BuildCNIArgs(networkInfo.Args)), ";") | |||
| if result != nil { | |||
There was a problem hiding this comment.
参考多cni格式，后面改造可能会用到
| if err := json.Unmarshal(args.StdinData, &conf); err != nil { | ||
| return fmt.Errorf("conf error: %v", err) | ||
| } | ||
| vlanIds, results, err := ipam.Allocate(conf.IPAM.Type, args) |
There was a problem hiding this comment.
还是调用一次这个veth插件配置多个网卡？可以以后再改吧
There was a problem hiding this comment.
是的，不然这里涉及到的改动太多，方案也还需讨论
| runtime.LockOSThread() | ||
| } | ||
|
|
||
| func main() { |
There was a problem hiding this comment.
改下文档supported-cnis.md，简单介绍下怎么使用这个cni插件吗？比如需要管理员自己把vlan网卡和路由配置好
Signed-off-by: forrestchen <forrestchen@tencent.com>
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.
Signed-off-by: forrestchen forrestchen@tencent.com