42398825ed
With CRI, kubelet no longer sets up networking for the pods. The dockershim package is the rightful owner and the only user of the newtork package. This change moves the package into dockershim to make the distinction obvious, and untangles the codebase. The`network/dns`is kept in the original package since it is only used by kubelet.
78 lines
2.3 KiB
Go
78 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/dockershim/network"
|
|
)
|
|
|
|
func getLoNetwork(binDirs []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)
|
|
}
|
|
loNetwork := &cniNetwork{
|
|
name: "lo",
|
|
NetworkConfig: loConfig,
|
|
CNIConfig: &libcni.CNIConfig{Path: binDirs},
|
|
}
|
|
|
|
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
|
|
}
|