intel / multus-cni / 730

Committed 22 Mar 2019 01:50PM UTC coverage: 52.841% (+1.2%) from 51.624%

Build # 730

Build Type

push

travis-ci

Committed by

dougbtv

Commit Message

<a href="https://github.com/intel/multus-cni/commit/<a class=hub.com/intel/multus-cni/commit/<a class="double-link" href="https://git"><a class=hub.com/intel/multus-cni/commit/<a class="double-link" href="https://git"><a class=hub.com/intel/multus-cni/commit/d3c92b4aa23142c6714cf37046013c7de7eafde3">d3c92b4aa">&lt;a href=&quot;https://github.com/intel/multus-cni/commit/</a><a class="double-link" href="https://github.com/intel/multus-cni/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/intel/multus-cni/commit/d3c92b4aa23142c6714cf37046013c7de7eafde3">d3c92b4aa</a><a href="https://github.com/intel/multus-cni/commit/d3c92b4aa23142c6714cf37046013c7de7eafde3">&lt;a href=&quot;https://github.com/intel/multus-cni/commit/d3c92b4aa23142c6714cf37046013c7de7eafde3&quot;&gt;&amp;quot;&amp;gt;add kubelet client for Pod resource info

This change introduces kubelet client to get allocated device
information of a Pod from newly added Kubelet grpc service.
For more information please see:
[kubernetes/kubernetes#70508](https://github.com/kubernetes/kubernetes</a>/pull/70508)

Change-Id: I&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/intel/multus-cni/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/intel/multus-cni/commit/11e58ccdd&quot;&gt;11e58ccdd&lt;/a&gt;&quot;&gt;11e58ccdd&lt;/a&gt;&lt;a href=&quot;https://github.com/intel/multus-cni/commit/d3c92b4aa23142c6</a>714cf37046013c7de7eafde3">
Signed-off-by: Abdul Halim &lt;abdul.halim@intel.com&gt;</a>

Run Details

77 of 77 new or added lines in 3 files covered. (100.0%)

651 of 1232 relevant lines covered (52.84%)

3.92 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

76.19

/kubeletclient/kubeletclient.go

package kubeletclient

import (
        "os"
        "path/filepath"
        "time"

        "github.com/intel/multus-cni/checkpoint"
        "github.com/intel/multus-cni/logging"
        "github.com/intel/multus-cni/types"
        "golang.org/x/net/context"
        v1 "k8s.io/api/core/v1"
        "k8s.io/kubernetes/pkg/kubelet/apis/podresources"
        podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1"
        "k8s.io/kubernetes/pkg/kubelet/util"
)

const (
        defaultKubeletSocketFile   = "kubelet.sock"
        defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb
)

var (
        kubeletSocket           string
        defaultPodResourcesPath = "/var/lib/kubelet/pod-resources"
)

// GetResourceClient returns an instance of ResourceClient interface initialized with Pod resource information
func GetResourceClient() (types.ResourceClient, error) {
        // If Kubelet resource API endpoint exist use that by default
        // Or else fallback with checkpoint file
        if hasKubeletAPIEndpoint() {
                logging.Printf(logging.VerboseLevel, "GetResourceClient(): using Kubelet resource API endpoint")
                return getKubeletClient()
        } else {
                logging.Printf(logging.VerboseLevel, "GetResourceClient(): using Kubelet device plugin checkpoint")
                return checkpoint.GetCheckpoint()
        }
}

func getKubeletClient() (types.ResourceClient, error) {
        newClient := &kubeletClient{}
        if kubeletSocket == "" {
                kubeletSocket = util.LocalEndpoint(defaultPodResourcesPath, podresources.Socket)
        }

        client, conn, err := podresources.GetClient(kubeletSocket, 10*time.Second, defaultPodResourcesMaxSize)
        if err != nil {
                return nil, logging.Errorf("GetResourceClient(): error getting grpc client: %v\n", err)
        }
        defer conn.Close()

        if err := newClient.getPodResources(client); err != nil {
                return nil, logging.Errorf("GetResourceClient(): error getting resource client: %v\n", err)
        }

        return newClient, nil
}

type kubeletClient struct {
        resources []*podresourcesapi.PodResources
}

func (rc *kubeletClient) getPodResources(client podresourcesapi.PodResourcesListerClient) error {

        ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
        defer cancel()

        resp, err := client.List(ctx, &podresourcesapi.ListPodResourcesRequest{})
        if err != nil {
                return logging.Errorf("getPodResources(): %v.Get(_) = _, %v", client, err)
        }

        rc.resources = resp.PodResources
        return nil
}

// GetPodResourceMap returns an instance of a map of Pod ResourceInfo given a (Pod name, namespace) tuple
func (rc *kubeletClient) GetPodResourceMap(pod *v1.Pod) (map[string]*types.ResourceInfo, error) {
        resourceMap := make(map[string]*types.ResourceInfo)

        name := pod.Name
        ns := pod.Namespace

        if name == "" || ns == "" {
                return nil, logging.Errorf("GetPodResourcesMap(): Pod name or namespace cannot be empty")
        }

        for _, pr := range rc.resources {
                if pr.Name == name && pr.Namespace == ns {
                        for _, cnt := range pr.Containers {
                                for _, dev := range cnt.Devices {
                                        if rInfo, ok := resourceMap[dev.ResourceName]; ok {
                                                rInfo.DeviceIDs = append(rInfo.DeviceIDs, dev.DeviceIds...)
                                        } else {
                                                resourceMap[dev.ResourceName] = &types.ResourceInfo{DeviceIDs: dev.DeviceIds}
                                        }
                                }
                        }
                }
        }
        return resourceMap, nil
}

func hasKubeletAPIEndpoint() bool {
        // Check for kubelet resource API socket file
        kubeletAPISocket := filepath.Join(defaultPodResourcesPath, defaultKubeletSocketFile)
        if _, err := os.Stat(kubeletAPISocket); err != nil {
                logging.Verbosef("hasKubeletAPIEndpoint(): error looking up kubelet resource api socket file: %q", err)
                return false
        }
        return true
}

1	package kubeletclient
2
3	import (
4	"os"
5	"path/filepath"
6	"time"
7
8	"github.com/intel/multus-cni/checkpoint"
9	"github.com/intel/multus-cni/logging"
10	"github.com/intel/multus-cni/types"
11	"golang.org/x/net/context"
12	v1 "k8s.io/api/core/v1"
13	"k8s.io/kubernetes/pkg/kubelet/apis/podresources"
14	podresourcesapi "k8s.io/kubernetes/pkg/kubelet/apis/podresources/v1alpha1"
15	"k8s.io/kubernetes/pkg/kubelet/util"
16	)
17
18	const (
19	defaultKubeletSocketFile = "kubelet.sock"
20	defaultPodResourcesMaxSize = 1024 * 1024 * 16 // 16 Mb
21	)
22
23	var (
24	kubeletSocket string
25	defaultPodResourcesPath = "/var/lib/kubelet/pod-resources"
26	)
27
28	// GetResourceClient returns an instance of ResourceClient interface initialized with Pod resource information
29	func GetResourceClient() (types.ResourceClient, error) {	1✔
30	// If Kubelet resource API endpoint exist use that by default	1✔
31	// Or else fallback with checkpoint file	1✔
32	if hasKubeletAPIEndpoint() {	2✔
33	logging.Printf(logging.VerboseLevel, "GetResourceClient(): using Kubelet resource API endpoint")	1✔
34	return getKubeletClient()	1✔
35	} else {	1✔
36	logging.Printf(logging.VerboseLevel, "GetResourceClient(): using Kubelet device plugin checkpoint")	×
37	return checkpoint.GetCheckpoint()	×
38	}	×
39	}
40
41	func getKubeletClient() (types.ResourceClient, error) {	5✔
42	newClient := &kubeletClient{}	5✔
43	if kubeletSocket == "" {	5✔
44	kubeletSocket = util.LocalEndpoint(defaultPodResourcesPath, podresources.Socket)	×
45	}	×
46
47	client, conn, err := podresources.GetClient(kubeletSocket, 10*time.Second, defaultPodResourcesMaxSize)	5✔
48	if err != nil {	5✔
49	return nil, logging.Errorf("GetResourceClient(): error getting grpc client: %v\n", err)	×
50	}	×
51	defer conn.Close()	5✔
52		5✔
53	if err := newClient.getPodResources(client); err != nil {	5✔
54	return nil, logging.Errorf("GetResourceClient(): error getting resource client: %v\n", err)	×
55	}	×
56
57	return newClient, nil	5✔
58	}
59
60	type kubeletClient struct {
61	resources []*podresourcesapi.PodResources
62	}
63
64	func (rc *kubeletClient) getPodResources(client podresourcesapi.PodResourcesListerClient) error {	5✔
65		5✔
66	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)	5✔
67	defer cancel()	5✔
68		5✔
69	resp, err := client.List(ctx, &podresourcesapi.ListPodResourcesRequest{})	5✔
70	if err != nil {	5✔
71	return logging.Errorf("getPodResources(): %v.Get(_) = _, %v", client, err)	×
72	}	×
73
74	rc.resources = resp.PodResources	5✔
75	return nil	5✔
76	}
77
78	// GetPodResourceMap returns an instance of a map of Pod ResourceInfo given a (Pod name, namespace) tuple
79	func (rc kubeletClient) GetPodResourceMap(pod v1.Pod) (map[string]*types.ResourceInfo, error) {	4✔
80	resourceMap := make(map[string]*types.ResourceInfo)	4✔
81		4✔
82	name := pod.Name	4✔
83	ns := pod.Namespace	4✔
84		4✔
85	if name == "" \|\| ns == "" {	6✔
86	return nil, logging.Errorf("GetPodResourcesMap(): Pod name or namespace cannot be empty")	2✔
87	}	2✔
88
89	for _, pr := range rc.resources {	4✔
90	if pr.Name == name && pr.Namespace == ns {	3✔
91	for _, cnt := range pr.Containers {	2✔
92	for _, dev := range cnt.Devices {	2✔
93	if rInfo, ok := resourceMap[dev.ResourceName]; ok {	1✔
94	rInfo.DeviceIDs = append(rInfo.DeviceIDs, dev.DeviceIds...)	×
95	} else {	1✔
96	resourceMap[dev.ResourceName] = &types.ResourceInfo{DeviceIDs: dev.DeviceIds}	1✔
97	}	1✔
98	}
99	}
100	}
101	}
102	return resourceMap, nil	2✔
103	}
104
105	func hasKubeletAPIEndpoint() bool {	1✔
106	// Check for kubelet resource API socket file	1✔
107	kubeletAPISocket := filepath.Join(defaultPodResourcesPath, defaultKubeletSocketFile)	1✔
108	if _, err := os.Stat(kubeletAPISocket); err != nil {	1✔
109	logging.Verbosef("hasKubeletAPIEndpoint(): error looking up kubelet resource api socket file: %q", err)	×
110	return false	×
111	}	×
112	return true	1✔
113	}

intel / multus-cni / 730

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous