-
Notifications
You must be signed in to change notification settings - Fork 39
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
add k8s-pure cni #67
add k8s-pure cni #67
Conversation
Tests failed. |
Signed-off-by: forrestchen <[email protected]>
Fixed |
Signed-off-by: forrestchen <[email protected]>
b14d6bf
to
a10c266
Compare
Signed-off-by: forrestchen <[email protected]>
@@ -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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个改动哪里用到了吗?
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.
不过不用删
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.
参考多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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
还是调用一次这个veth插件配置多个网卡?可以以后再改吧
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.
是的,不然这里涉及到的改动太多,方案也还需讨论
runtime.LockOSThread() | ||
} | ||
|
||
func main() { |
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.
改下文档supported-cnis.md,简单介绍下怎么使用这个cni插件吗?比如需要管理员自己把vlan网卡和路由配置好
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.
好的
Signed-off-by: forrestchen <[email protected]>
Signed-off-by: forrestchen [email protected]