d5acb127b8
Updates the spec and plugins to return an array of interfaces and IP details to the runtime including: - interface names and MAC addresses configured by the plugin - whether the interfaces are sandboxed (container/VM) or host (bridge, veth, etc) - multiple IP addresses configured by IPAM and which interface they have been assigned to Returning interface details is useful for runtimes, as well as allowing more flexible chaining of CNI plugins themselves. For example, some meta plugins may need to know the host-side interface to be able to apply firewall or traffic shaping rules to the container.
85 lines
2.2 KiB
Go
85 lines
2.2 KiB
Go
// Copyright 2015 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.
|
|
|
|
package allocator
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"net"
|
|
|
|
"github.com/containernetworking/cni/pkg/types"
|
|
)
|
|
|
|
// IPAMConfig represents the IP related network configuration.
|
|
type IPAMConfig struct {
|
|
Name string
|
|
Type string `json:"type"`
|
|
RangeStart net.IP `json:"rangeStart"`
|
|
RangeEnd net.IP `json:"rangeEnd"`
|
|
Subnet types.IPNet `json:"subnet"`
|
|
Gateway net.IP `json:"gateway"`
|
|
Routes []types.Route `json:"routes"`
|
|
DataDir string `json:"dataDir"`
|
|
ResolvConf string `json:"resolvConf"`
|
|
Args *IPAMArgs `json:"-"`
|
|
}
|
|
|
|
type IPAMArgs struct {
|
|
types.CommonArgs
|
|
IP net.IP `json:"ip,omitempty"`
|
|
}
|
|
|
|
type Net struct {
|
|
Name string `json:"name"`
|
|
CNIVersion string `json:"cniVersion"`
|
|
IPAM *IPAMConfig `json:"ipam"`
|
|
}
|
|
|
|
// NewIPAMConfig creates a NetworkConfig from the given network name.
|
|
func LoadIPAMConfig(bytes []byte, args string) (*IPAMConfig, string, error) {
|
|
n := Net{}
|
|
if err := json.Unmarshal(bytes, &n); err != nil {
|
|
return nil, "", err
|
|
}
|
|
|
|
if args != "" {
|
|
n.IPAM.Args = &IPAMArgs{}
|
|
err := types.LoadArgs(args, n.IPAM.Args)
|
|
if err != nil {
|
|
return nil, "", err
|
|
}
|
|
}
|
|
|
|
if n.IPAM == nil {
|
|
return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
|
|
}
|
|
|
|
// Copy net name into IPAM so not to drag Net struct around
|
|
n.IPAM.Name = n.Name
|
|
|
|
return n.IPAM, n.CNIVersion, nil
|
|
}
|
|
|
|
func convertRoutesToCurrent(routes []types.Route) []*types.Route {
|
|
var currentRoutes []*types.Route
|
|
for _, r := range routes {
|
|
currentRoutes = append(currentRoutes, &types.Route{
|
|
Dst: r.Dst,
|
|
GW: r.GW,
|
|
})
|
|
}
|
|
return currentRoutes
|
|
}
|