9592148577

Committed 20 Jun 2024 05:30AM UTC coverage: 52.687% (-0.06%) from 52.747%

Build # 9592148577

Build Type

Pull #4433

github

Committed by

qinqon

Commit Message

node: Use mdlayher/arp at link_network_manager

Signed-off-by: Enrique Llorente <ellorent@redhat.com>

Pull Request Pull Request #4433: node: Use mdlayher/arp at link_network_manager

Run Details

6 of 73 new or added lines in 2 files covered. (8.22%)

13 existing lines in 4 files now uncovered.

28716 of 54503 relevant lines covered (52.69%)

100.45 hits per line

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

60.0

/go-controller/pkg/ovn/controller/apbroute/master_controller.go

package apbroute

import (
        "context"
        "fmt"
        "net"
        "strings"
        "sync"

        libovsdbclient "github.com/ovn-org/libovsdb/client"
        apierrors "k8s.io/apimachinery/pkg/api/errors"
        metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
        "k8s.io/apimachinery/pkg/util/sets"
        coreinformers "k8s.io/client-go/informers/core/v1"
        corev1listers "k8s.io/client-go/listers/core/v1"
        "k8s.io/klog/v2"

        adminpolicybasedrouteapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1"
        adminpolicybasedrouteapply "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/applyconfiguration/adminpolicybasedroute/v1"
        adminpolicybasedrouteclient "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/clientset/versioned"
        adminpolicybasedrouteinformer "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/informers/externalversions/adminpolicybasedroute/v1"
        libovsdbutil "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdb/util"
        addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
        "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
)

// Admin Policy Based Route services

type ExternalGatewayMasterController struct {
        apbRoutePolicyClient adminpolicybasedrouteclient.Interface

        mgr                      *externalPolicyManager
        nbClient                 *northBoundClient
        ExternalGWRouteInfoCache *ExternalGatewayRouteInfoCache

        zoneID string
}

func NewExternalMasterController(
        apbRoutePolicyClient adminpolicybasedrouteclient.Interface,
        stopCh <-chan struct{},
        podInformer coreinformers.PodInformer,
        namespaceInformer coreinformers.NamespaceInformer,
        apbRouteInformer adminpolicybasedrouteinformer.AdminPolicyBasedExternalRouteInformer,
        nodeLister corev1listers.NodeLister,
        nbClient libovsdbclient.Client,
        addressSetFactory addressset.AddressSetFactory,
        controllerName string,
        zoneID string,
) (*ExternalGatewayMasterController, error) {

        externalGWRouteInfo := NewExternalGatewayRouteInfoCache()
        zone, err := libovsdbutil.GetNBZone(nbClient)
        if err != nil {
                return nil, err
        }
        nbCli := &northBoundClient{
                routeLister:              apbRouteInformer.Lister(),
                nodeLister:               nodeLister,
                podLister:                podInformer.Lister(),
                nbClient:                 nbClient,
                addressSetFactory:        addressSetFactory,
                controllerName:           controllerName,
                zone:                     zone,
                externalGatewayRouteInfo: externalGWRouteInfo,
        }

        c := &ExternalGatewayMasterController{
                apbRoutePolicyClient:     apbRoutePolicyClient,
                ExternalGWRouteInfoCache: externalGWRouteInfo,
                nbClient:                 nbCli,
                zoneID:                   zoneID,
        }
        c.mgr = newExternalPolicyManager(
                stopCh,
                podInformer,
                namespaceInformer,
                apbRouteInformer,
                nbCli,
                c.updateStatusAPBExternalRoute,
        )
        return c, nil
}

func (c *ExternalGatewayMasterController) Run(wg *sync.WaitGroup, threadiness int) error {
        klog.V(4).Info("Starting Admin Policy Based Route Controller")

        return c.mgr.Run(wg, threadiness)
}

func (c *ExternalGatewayMasterController) GetAdminPolicyBasedExternalRouteIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {
        gwIPs, err := c.mgr.getDynamicGatewayIPsForTargetNamespace(namespaceName)
        if err != nil {
                return nil, err
        }
        tmpIPs, err := c.mgr.getStaticGatewayIPsForTargetNamespace(namespaceName)
        if err != nil {
                return nil, err
        }

        return gwIPs.Union(tmpIPs), nil
}

// updateStatusAPBExternalRoute updates the CR with the current status of the CR instance, including errors captured while processing the CR during its lifetime
func (c *ExternalGatewayMasterController) updateStatusAPBExternalRoute(policyName string, gwIPs sets.Set[string],
        syncError error) error {
        if gwIPs == nil {
                // policy doesn't exist anymore, nothing to do
                return nil
        }

        // get object from the informer cache. No need to get the object from the kube-apiserver, since patch
        // doesn't check resource versions, and no one else can update status message owned by current zone.
        routePolicy, err := c.mgr.routeLister.Get(policyName)
        if err != nil {
                if apierrors.IsNotFound(err) {
                        // policy doesn't exist, no need to update status
                        return nil
                }
                return err
        }
        newMsg := fmt.Sprintf("configured external gateway IPs: %s", strings.Join(sets.List(gwIPs), ","))
        if syncError != nil {
                newMsg = fmt.Sprintf("%s %s: %v", c.zoneID, types.APBRouteErrorMsg, syncError.Error())
        }
        newMsg = types.GetZoneStatus(c.zoneID, newMsg)
        needsUpdate := true
        for _, message := range routePolicy.Status.Messages {
                if message == newMsg {
                        // found previous status
                        needsUpdate = false
                        break
                }
        }
        if !needsUpdate {
                return nil
        }

        applyOptions := metav1.ApplyOptions{
                Force:        true,
                FieldManager: c.zoneID,
        }
        applyObj := adminpolicybasedrouteapply.AdminPolicyBasedExternalRoute(policyName).
                WithStatus(adminpolicybasedrouteapply.AdminPolicyBasedRouteStatus().
                        WithMessages(newMsg).
                        WithLastTransitionTime(metav1.Now()))
        _, err = c.apbRoutePolicyClient.K8sV1().AdminPolicyBasedExternalRoutes().ApplyStatus(context.TODO(), applyObj, applyOptions)

        if err != nil {
                return err
        }
        return nil
}

func (c *ExternalGatewayMasterController) GetDynamicGatewayIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {
        return c.mgr.getDynamicGatewayIPsForTargetNamespace(namespaceName)
}

func (c *ExternalGatewayMasterController) GetStaticGatewayIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {
        return c.mgr.getStaticGatewayIPsForTargetNamespace(namespaceName)
}

// AddHybridRoutePolicyForPod exposes the function addHybridRoutePolicyForPod
func (c *ExternalGatewayMasterController) AddHybridRoutePolicyForPod(podIP net.IP, node string) error {
        return c.nbClient.addHybridRoutePolicyForPod(podIP, node)
}

// DelHybridRoutePolicyForPod exposes the function delHybridRoutePolicyForPod
func (c *ExternalGatewayMasterController) DelHybridRoutePolicyForPod(podIP net.IP, node string) error {
        return c.nbClient.delHybridRoutePolicyForPod(podIP, node)
}

// DelAllHybridRoutePolicies exposes the function delAllHybridRoutePolicies
func (c *ExternalGatewayMasterController) DelAllHybridRoutePolicies() error {
        return c.nbClient.delAllHybridRoutePolicies()
}

// DelAllLegacyHybridRoutePolicies exposes the function delAllLegacyHybridRoutePolicies
func (c *ExternalGatewayMasterController) DelAllLegacyHybridRoutePolicies() error {
        return c.nbClient.delAllLegacyHybridRoutePolicies()
}

// DeletePodSNAT exposes the function deletePodSNAT
func (c *ExternalGatewayMasterController) DeletePodSNAT(nodeName string, extIPs, podIPNets []*net.IPNet) error {
        return c.nbClient.deletePodSNAT(nodeName, extIPs, podIPNets)
}

func (c *ExternalGatewayMasterController) GetAPBRoutePolicyStatus(policyName string) (*adminpolicybasedrouteapi.AdminPolicyBasedRouteStatus, error) {
        pol, err := c.mgr.routeLister.Get(policyName)
        if err != nil {
                return nil, err
        }
        return &pol.Status, nil
}

1	package apbroute
2
3	import (
4	"context"
5	"fmt"
6	"net"
7	"strings"
8	"sync"
9
10	libovsdbclient "github.com/ovn-org/libovsdb/client"
11	apierrors "k8s.io/apimachinery/pkg/api/errors"
12	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13	"k8s.io/apimachinery/pkg/util/sets"
14	coreinformers "k8s.io/client-go/informers/core/v1"
15	corev1listers "k8s.io/client-go/listers/core/v1"
16	"k8s.io/klog/v2"
17
18	adminpolicybasedrouteapi "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1"
19	adminpolicybasedrouteapply "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/applyconfiguration/adminpolicybasedroute/v1"
20	adminpolicybasedrouteclient "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/clientset/versioned"
21	adminpolicybasedrouteinformer "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/crd/adminpolicybasedroute/v1/apis/informers/externalversions/adminpolicybasedroute/v1"
22	libovsdbutil "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/libovsdb/util"
23	addressset "github.com/ovn-org/ovn-kubernetes/go-controller/pkg/ovn/address_set"
24	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/types"
25	)
26
27	// Admin Policy Based Route services
28
29	type ExternalGatewayMasterController struct {
30	apbRoutePolicyClient adminpolicybasedrouteclient.Interface
31
32	mgr *externalPolicyManager
33	nbClient *northBoundClient
34	ExternalGWRouteInfoCache *ExternalGatewayRouteInfoCache
35
36	zoneID string
37	}
38
39	func NewExternalMasterController(
40	apbRoutePolicyClient adminpolicybasedrouteclient.Interface,
41	stopCh <-chan struct{},
42	podInformer coreinformers.PodInformer,
43	namespaceInformer coreinformers.NamespaceInformer,
44	apbRouteInformer adminpolicybasedrouteinformer.AdminPolicyBasedExternalRouteInformer,
45	nodeLister corev1listers.NodeLister,
46	nbClient libovsdbclient.Client,
47	addressSetFactory addressset.AddressSetFactory,
48	controllerName string,
49	zoneID string,
50	) (*ExternalGatewayMasterController, error) {	38✔
51		38✔
52	externalGWRouteInfo := NewExternalGatewayRouteInfoCache()	38✔
53	zone, err := libovsdbutil.GetNBZone(nbClient)	38✔
54	if err != nil {	38✔
55	return nil, err	×
56	}	×
57	nbCli := &northBoundClient{	38✔
58	routeLister: apbRouteInformer.Lister(),	38✔
59	nodeLister: nodeLister,	38✔
60	podLister: podInformer.Lister(),	38✔
61	nbClient: nbClient,	38✔
62	addressSetFactory: addressSetFactory,	38✔
63	controllerName: controllerName,	38✔
64	zone: zone,	38✔
65	externalGatewayRouteInfo: externalGWRouteInfo,	38✔
66	}	38✔
67		38✔
68	c := &ExternalGatewayMasterController{	38✔
69	apbRoutePolicyClient: apbRoutePolicyClient,	38✔
70	ExternalGWRouteInfoCache: externalGWRouteInfo,	38✔
71	nbClient: nbCli,	38✔
72	zoneID: zoneID,	38✔
73	}	38✔
74	c.mgr = newExternalPolicyManager(	38✔
75	stopCh,	38✔
76	podInformer,	38✔
77	namespaceInformer,	38✔
78	apbRouteInformer,	38✔
79	nbCli,	38✔
80	c.updateStatusAPBExternalRoute,	38✔
81	)	38✔
82	return c, nil	38✔
83	}
84
85	func (c ExternalGatewayMasterController) Run(wg sync.WaitGroup, threadiness int) error {	38✔
86	klog.V(4).Info("Starting Admin Policy Based Route Controller")	38✔
87		38✔
88	return c.mgr.Run(wg, threadiness)	38✔
89	}	38✔
90
91	func (c *ExternalGatewayMasterController) GetAdminPolicyBasedExternalRouteIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {	×
92	gwIPs, err := c.mgr.getDynamicGatewayIPsForTargetNamespace(namespaceName)	×
93	if err != nil {	×
94	return nil, err	×
95	}	×
96	tmpIPs, err := c.mgr.getStaticGatewayIPsForTargetNamespace(namespaceName)	×
97	if err != nil {	×
98	return nil, err	×
99	}	×
100
101	return gwIPs.Union(tmpIPs), nil	×
102	}
103
104	// updateStatusAPBExternalRoute updates the CR with the current status of the CR instance, including errors captured while processing the CR during its lifetime
105	func (c *ExternalGatewayMasterController) updateStatusAPBExternalRoute(policyName string, gwIPs sets.Set[string],
106	syncError error) error {	133✔
107	if gwIPs == nil {	135✔
108	// policy doesn't exist anymore, nothing to do	2✔
109	return nil	2✔
110	}	2✔
111
112	// get object from the informer cache. No need to get the object from the kube-apiserver, since patch
113	// doesn't check resource versions, and no one else can update status message owned by current zone.
114	routePolicy, err := c.mgr.routeLister.Get(policyName)	131✔
115	if err != nil {	131✔
UNCOV 116	if apierrors.IsNotFound(err) {	×
UNCOV 117	// policy doesn't exist, no need to update status	×
UNCOV 118	return nil	×
UNCOV 119	}	×
120	return err	×
121	}
122	newMsg := fmt.Sprintf("configured external gateway IPs: %s", strings.Join(sets.List(gwIPs), ","))	131✔
123	if syncError != nil {	135✔
124	newMsg = fmt.Sprintf("%s %s: %v", c.zoneID, types.APBRouteErrorMsg, syncError.Error())	4✔
125	}	4✔
126	newMsg = types.GetZoneStatus(c.zoneID, newMsg)	131✔
127	needsUpdate := true	131✔
128	for _, message := range routePolicy.Status.Messages {	208✔
129	if message == newMsg {	135✔
130	// found previous status	58✔
131	needsUpdate = false	58✔
132	break	58✔
133	}
134	}
135	if !needsUpdate {	189✔
136	return nil	58✔
137	}	58✔
138
139	applyOptions := metav1.ApplyOptions{	73✔
140	Force: true,	73✔
141	FieldManager: c.zoneID,	73✔
142	}	73✔
143	applyObj := adminpolicybasedrouteapply.AdminPolicyBasedExternalRoute(policyName).	73✔
144	WithStatus(adminpolicybasedrouteapply.AdminPolicyBasedRouteStatus().	73✔
145	WithMessages(newMsg).	73✔
146	WithLastTransitionTime(metav1.Now()))	73✔
147	_, err = c.apbRoutePolicyClient.K8sV1().AdminPolicyBasedExternalRoutes().ApplyStatus(context.TODO(), applyObj, applyOptions)	73✔
148		73✔
149	if err != nil {	73✔
150	return err	×
151	}	×
152	return nil	73✔
153	}
154
155	func (c *ExternalGatewayMasterController) GetDynamicGatewayIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {	×
156	return c.mgr.getDynamicGatewayIPsForTargetNamespace(namespaceName)	×
157	}	×
158
159	func (c *ExternalGatewayMasterController) GetStaticGatewayIPsForTargetNamespace(namespaceName string) (sets.Set[string], error) {	×
160	return c.mgr.getStaticGatewayIPsForTargetNamespace(namespaceName)	×
161	}	×
162
163	// AddHybridRoutePolicyForPod exposes the function addHybridRoutePolicyForPod
164	func (c *ExternalGatewayMasterController) AddHybridRoutePolicyForPod(podIP net.IP, node string) error {	×
165	return c.nbClient.addHybridRoutePolicyForPod(podIP, node)	×
166	}	×
167
168	// DelHybridRoutePolicyForPod exposes the function delHybridRoutePolicyForPod
169	func (c *ExternalGatewayMasterController) DelHybridRoutePolicyForPod(podIP net.IP, node string) error {	×
170	return c.nbClient.delHybridRoutePolicyForPod(podIP, node)	×
171	}	×
172
173	// DelAllHybridRoutePolicies exposes the function delAllHybridRoutePolicies
174	func (c *ExternalGatewayMasterController) DelAllHybridRoutePolicies() error {	×
175	return c.nbClient.delAllHybridRoutePolicies()	×
176	}	×
177
178	// DelAllLegacyHybridRoutePolicies exposes the function delAllLegacyHybridRoutePolicies
179	func (c *ExternalGatewayMasterController) DelAllLegacyHybridRoutePolicies() error {	×
180	return c.nbClient.delAllLegacyHybridRoutePolicies()	×
181	}	×
182
183	// DeletePodSNAT exposes the function deletePodSNAT
184	func (c ExternalGatewayMasterController) DeletePodSNAT(nodeName string, extIPs, podIPNets []net.IPNet) error {	×
185	return c.nbClient.deletePodSNAT(nodeName, extIPs, podIPNets)	×
186	}	×
187
188	func (c ExternalGatewayMasterController) GetAPBRoutePolicyStatus(policyName string) (adminpolicybasedrouteapi.AdminPolicyBasedRouteStatus, error) {	×
189	pol, err := c.mgr.routeLister.Get(policyName)	×
190	if err != nil {	×
191	return nil, err	×
192	}	×
193	return &pol.Status, nil	×
194	}

ovn-org / ovn-kubernetes / 9592148577

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