d7f9e22815
Following are part of this commit
+++++++++++++++++++++++++++++++++
* Windows CNI Support
(1) Support to use --network-plugin=cni
(2) Handled platform requirement of calling CNI ADD for all the containers.
(2.1) For POD Infra container, netNs has to be empty
(2.2) For all other containers, sharing the network namespace of POD container,
should pass netNS name as "container:<Pod Infra Container Id>", same as the
NetworkMode of the current container
(2.3) The Windows CNI plugin has to handle this to call into Platform.
Sample Windows CNI Plugin code to be shared soon.
* Sandbox support for Windows
(1) Sandbox support for Windows. Works only with Docker runtime.
(2) Retained CONTAINER_NETWORK as a backward compatibilty flag,
to not break existing deployments using it.
(3) Works only with CNI plugin enabled.
(*) Changes to reinvoke CNI ADD for every new container created. This is hooked up with PodStatus,
but would be ideal to move it outside of this, once we have CNI GET support
81 lines
2.3 KiB
Go
81 lines
2.3 KiB
Go
// +build !windows
|
|
|
|
/*
|
|
Copyright 2017 The Kubernetes 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 cni
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/containernetworking/cni/libcni"
|
|
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
|
|
"k8s.io/kubernetes/pkg/kubelet/network"
|
|
)
|
|
|
|
func getLoNetwork(binDir, vendorDirPrefix string) *cniNetwork {
|
|
loConfig, err := libcni.ConfListFromBytes([]byte(`{
|
|
"cniVersion": "0.2.0",
|
|
"name": "cni-loopback",
|
|
"plugins":[{
|
|
"type": "loopback"
|
|
}]
|
|
}`))
|
|
if err != nil {
|
|
// The hardcoded config above should always be valid and unit tests will
|
|
// catch this
|
|
panic(err)
|
|
}
|
|
cninet := &libcni.CNIConfig{
|
|
Path: []string{vendorCNIDir(vendorDirPrefix, "loopback"), binDir},
|
|
}
|
|
loNetwork := &cniNetwork{
|
|
name: "lo",
|
|
NetworkConfig: loConfig,
|
|
CNIConfig: cninet,
|
|
}
|
|
|
|
return loNetwork
|
|
}
|
|
|
|
func (plugin *cniNetworkPlugin) platformInit() error {
|
|
var err error
|
|
plugin.nsenterPath, err = plugin.execer.LookPath("nsenter")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// TODO: Use the addToNetwork function to obtain the IP of the Pod. That will assume idempotent ADD call to the plugin.
|
|
// Also fix the runtime's call to Status function to be done only in the case that the IP is lost, no need to do periodic calls
|
|
func (plugin *cniNetworkPlugin) GetPodNetworkStatus(namespace string, name string, id kubecontainer.ContainerID) (*network.PodNetworkStatus, error) {
|
|
netnsPath, err := plugin.host.GetNetNS(id.ID)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("CNI failed to retrieve network namespace path: %v", err)
|
|
}
|
|
if netnsPath == "" {
|
|
return nil, fmt.Errorf("Cannot find the network namespace, skipping pod network status for container %q", id)
|
|
}
|
|
|
|
ip, err := network.GetPodIP(plugin.execer, plugin.nsenterPath, netnsPath, network.DefaultInterfaceName)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &network.PodNetworkStatus{IP: ip}, nil
|
|
}
|