8000 Release/v1.88.0 by lx1036 · Pull Request #258 · lx1036/code · GitHub
[go: up one dir, main page]
Skip to content

Release/v1.88.0 #258

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
May 30, 2022
Merged

Release/v1.88.0 #258

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bcc9ef6
Merge pull request #255 from lx1036/release/v1.87.0
lx1036 May 9, 2022
4581201
(cni)debug cni bridge plugin in local
lx1036 May 9, 2022
9ff2b10
(algo)priority queue
lx1036 May 12, 2022
86b4544
typo
lx1036 May 18, 2022
f16e237
Bump ejs from 3.1.3 to 3.1.8 in /go/k8s-ui/frontend
dependabot[bot] May 16, 2022
39e3d9a
(cni)file lock in cni cmdDel
lx1036 May 18, 2022
8a9d015
(cni)eni cmdDel ipvlan interface
lx1036 May 18, 2022
b1208dd
(cni)boltdb local pods
lx1036 May 18, 2022
df79083
(cni)cmdDel GetIPInfo()
lx1036 May 18, 2022
393b1e7
Bump github.com/opencontainers/runc from 1.0.2 to 1.1.2 in /go
dependabot[bot] May 24, 2022
9e88823
(cni)save map[podInfo]ENI relationship to boltdb
lx1036 May 25, 2022
627068a
move files
lx1036 May 25, 2022
7be7c72
(ipvs)ipvs for L4 loadbalancer
lx1036 May 26, 2022
f2777c7
(ipvs)ipvs for L4 loadbalancer
lx1036 May 29, 2022
8c4610d
move files
lx1036 May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
typo
  • Loading branch information
@lx1036
lx1036 committed May 18, 2022
commit 86b45440876cf25acfbe150e30fbeaa5c332c252
105 changes: 53 additions & 52 deletions go/k8s/network/cni/cni-on-vm/cmd/cni-plugin/cni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (

"github.com/containernetworking/cni/pkg/skel"
current "github.com/containernetworking/cni/pkg/types/100"
"github.com/containernetworking/cni/pkg/version"
cniversion "github.com/containernetworking/cni/pkg/version"
"github.com/containernetworking/plugins/pkg/ns"
"google.golang.org/grpc"
Expand Down Expand Up @@ -80,58 +81,7 @@ func init() {
}

func main() {
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, GetSpecVersionSupported(), "")
}

func parseCmdArgs(args *skel.CmdArgs) (string, ns.NetNS, *NetConf, *K8SArgs, error) {
versionDecoder := &cniversion.ConfigDecoder{}
confVersion, err := versionDecoder.Decode(args.StdinData)
if err != nil {
return "", nil, nil, nil, err
}
netNS, err := ns.GetNS(args.Netns) // open fd /proc/{pid}/ns/net
if err != nil {
return "", nil, nil, nil, err
}

conf := NetConf{}
if err = json.Unmarshal(args.StdinData, &conf); err != nil {
return "", nil, nil, nil, fmt.Errorf("error parse args, %w", err)
}
if conf.MTU == 0 {
conf.MTU = defaultMTU
}

k8sConfig := K8SArgs{}
if err = cniTypes.LoadArgs(args.Args, &k8sConfig); err != nil {
return "", nil, nil, nil, fmt.Errorf("error parse args, %w", err)
}

return confVersion, netNS, &conf, &k8sConfig, nil
}

// INFO: 获取 ENI gRPC Client，调用 ENI
func getNetworkClient() (rpc.EniBackendClient, func(), error) {
timeoutCtx, cancel := context.WithTimeout(context.Background(), defaultCniTimeout)
grpcConn, err := grpc.DialContext(timeoutCtx, defaultSocketPath, grpc.WithInsecure(), grpc.WithContextDialer(
func(ctx context.Context, s string) (net.Conn, error) {
unixAddr, err := net.ResolveUnixAddr("unix", defaultSocketPath)
if err != nil {
return nil, fmt.Errorf("error while resolve unix addr:%w", err)
}
d := &net.Dialer{}
return d.DialContext(timeoutCtx, "unix", unixAddr.String())
}))
if err != nil {
cancel()
return nil, nil, fmt.Errorf("error dial to terway %s, %w", defaultSocketPath, err)
}

eniBackendClient := rpc.NewEniBackendClient(grpcConn)
return eniBackendClient, func() {
grpcConn.Close()
cancel()
}, nil
skel.PluginMain(cmdAdd, cmdCheck, cmdDel, version.All, "eni")
}

func cmdAdd(args *skel.CmdArgs) error {
Expand Down Expand Up @@ -285,6 +235,57 @@ func cmdCheck(args *skel.CmdArgs) error {
panic("not implemented")
}

func parseCmdArgs(args *skel.CmdArgs) (string, ns.NetNS, *NetConf, *K8SArgs, error) {
versionDecoder := &cniversion.ConfigDecoder{}
confVersion, err := versionDecoder.Decode(args.StdinData)
if err != nil {
return "", nil, nil, nil, err
}
netNS, err := ns.GetNS(args.Netns) // open fd /proc/{pid}/ns/net
if err != nil {
return "", nil, nil, nil, err
}

conf := NetConf{}
if err = json.Unmarshal(args.StdinData, &conf); err != nil {
return "", nil, nil, nil, fmt.Errorf("error parse args, %w", err)
}
if conf.MTU == 0 {
conf.MTU = defaultMTU
}

k8sConfig := K8SArgs{}
if err = cniTypes.LoadArgs(args.Args, &k8sConfig); err != nil {
return "", nil, nil, nil, fmt.Errorf("error parse args, %w", err)
}

return confVersion, netNS, &conf, &k8sConfig, nil
}

// INFO: 获取 ENI gRPC Client，调用 ENI
func getNetworkClient() (rpc.EniBackendClient, func(), error) {
timeoutCtx, cancel := context.WithTimeout(context.Background(), defaultCniTimeout)
grpcConn, err := grpc.DialContext(timeoutCtx, defaultSocketPath, grpc.WithInsecure(), grpc.WithContextDialer(
func(ctx context.Context, s string) (net.Conn, error) {
unixAddr, err := net.ResolveUnixAddr("unix", defaultSocketPath)
if err != nil {
return nil, fmt.Errorf("error while resolve unix addr:%w", err)
}
d := &net.Dialer{}
return d.DialContext(timeoutCtx, "unix", unixAddr.String())
}))
if err != nil {
cancel()
return nil, nil, fmt.Errorf("error dial to terway %s, %w", defaultSocketPath, err)
}

eniBackendClient := rpc.NewEniBackendClient(grpcConn)
return eniBackendClient, func() {
grpcConn.Close()
cancel()
}, nil
}

func parseSetupConf(args *skel.CmdArgs, alloc *rpc.NetConf, conf *types.CNIConf, ipType rpc.IPType) (*types.SetupConfig, error) {
var (
err error
Expand Down
10 changes: 0 additions & 10 deletions go/k8s/network/cni/cni-on-vm/cmd/cni-plugin/version.go
View file
Open in desktop

This file was deleted.

0