-
Notifications
You must be signed in to change notification settings - Fork 781
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Only save 1 rendered netconf file named by sandbox containerID
- Loading branch information
Showing
4 changed files
with
191 additions
and
103 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| // Copyright 2018 CNI authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // This is a "meta-plugin". It reads in its own netconf, combines it with | ||
| // the data from flannel generated subnet file and then invokes a plugin | ||
| // like bridge or ipvlan to do the real work. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/containernetworking/cni/pkg/invoke" | ||
| "github.com/containernetworking/cni/pkg/skel" | ||
| "github.com/containernetworking/cni/pkg/types" | ||
| "os" | ||
| ) | ||
|
|
||
| func doCmdAdd(args *skel.CmdArgs, n *NetConf, fenv *subnetEnv) error { | ||
| n.Delegate["name"] = n.Name | ||
|
|
||
| if !hasKey(n.Delegate, "type") { | ||
| n.Delegate["type"] = "bridge" | ||
| } | ||
|
|
||
| if !hasKey(n.Delegate, "ipMasq") { | ||
| // if flannel is not doing ipmasq, we should | ||
| ipmasq := !*fenv.ipmasq | ||
| n.Delegate["ipMasq"] = ipmasq | ||
| } | ||
|
|
||
| if !hasKey(n.Delegate, "mtu") { | ||
| mtu := fenv.mtu | ||
| n.Delegate["mtu"] = mtu | ||
| } | ||
|
|
||
| if n.Delegate["type"].(string) == "bridge" { | ||
| if !hasKey(n.Delegate, "isGateway") { | ||
| n.Delegate["isGateway"] = true | ||
| } | ||
| } | ||
| if n.CNIVersion != "" { | ||
| n.Delegate["cniVersion"] = n.CNIVersion | ||
| } | ||
|
|
||
| n.Delegate["ipam"] = map[string]interface{}{ | ||
| "type": "host-local", | ||
| "subnet": fenv.sn.String(), | ||
| "routes": []types.Route{ | ||
| { | ||
| Dst: *fenv.nw, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| return delegateAdd(args.ContainerID, n.DataDir, n.Delegate) | ||
| } | ||
|
|
||
| func doCmdDel(args *skel.CmdArgs, n *NetConf) error { | ||
| netconfBytes, err := consumeScratchNetConf(args.ContainerID, n.DataDir) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| // Per spec should ignore error if resources are missing / already removed | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| nc := &types.NetConf{} | ||
| if err = json.Unmarshal(netconfBytes, nc); err != nil { | ||
| return fmt.Errorf("failed to parse netconf: %v", err) | ||
| } | ||
|
|
||
| return invoke.DelegateDel(nc.Type, netconfBytes, nil) | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Copyright 2018 CNI authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // This is a "meta-plugin". It reads in its own netconf, combines it with | ||
| // the data from flannel generated subnet file and then invokes a plugin | ||
| // like bridge or ipvlan to do the real work. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "github.com/containernetworking/cni/pkg/invoke" | ||
| "github.com/containernetworking/cni/pkg/skel" | ||
| "github.com/containernetworking/cni/pkg/types" | ||
| "github.com/containernetworking/cni/pkg/types/020" | ||
| "github.com/containernetworking/plugins/pkg/hns" | ||
| "os" | ||
| ) | ||
|
|
||
| func doCmdAdd(args *skel.CmdArgs, n *NetConf, fenv *subnetEnv) error { | ||
| n.Delegate["name"] = n.Name | ||
|
|
||
| if !hasKey(n.Delegate, "type") { | ||
| n.Delegate["type"] = "win-l2bridge" | ||
| } | ||
|
|
||
| // if flannel needs ipmasq - get the plugin to configure it | ||
| // (this is the opposite of how linux works - on linux the flannel daemon configure ipmasq) | ||
| if hasKey(n.Delegate, "ipMasq") { | ||
| n.Delegate["ipMasq"] = *fenv.ipmasq | ||
| } | ||
|
|
||
| n.Delegate["cniVersion"] = types020.ImplementedSpecVersion | ||
| if n.CNIVersion != "" { | ||
| n.Delegate["cniVersion"] = n.CNIVersion | ||
| } | ||
|
|
||
| switch n.Delegate["type"] { | ||
| case "win-l2bridge": | ||
| delete(n.Delegate, "endpointMacPrefix") | ||
| n.Delegate["clusterNetworkPrefix"] = fenv.nw.String() | ||
| case "win-overlay": | ||
| delete(n.Delegate, "clusterNetworkPrefix") | ||
| if !hasKey(n.Delegate, "ipMasq") { | ||
| n.Delegate["endpointMacPrefix"] = "0E-2A" | ||
| } | ||
|
|
||
| } | ||
| n.Delegate["ipam"] = map[string]interface{}{ | ||
| "type": "host-local", | ||
| "subnet": fenv.sn.String(), | ||
| } | ||
|
|
||
| return delegateAdd(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir, n.Delegate) | ||
| } | ||
|
|
||
| func doCmdDel(args *skel.CmdArgs, n *NetConf) error { | ||
| netconfBytes, err := consumeScratchNetConf(hns.GetSandboxContainerID(args.ContainerID, args.Netns), n.DataDir) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| // Per spec should ignore error if resources are missing / already removed | ||
| return nil | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| nc := &types.NetConf{} | ||
| if err = json.Unmarshal(netconfBytes, nc); err != nil { | ||
| return fmt.Errorf("failed to parse netconf: %v", err) | ||
| } | ||
|
|
||
| return invoke.DelegateDel(nc.Type, netconfBytes, nil) | ||
| } |