@@ -25,6 +25,8 @@ import (
2525 "github.com/containernetworking/cni/pkg/version"
2626 corev1 "k8s.io/api/core/v1"
2727 "k8s.io/apimachinery/pkg/util/sets"
28+ clientset "k8s.io/client-go/kubernetes"
29+ v1 "k8s.io/client-go/listers/core/v1"
2830 "k8s.io/klog/v2"
2931
3032 "antrea.io/antrea/pkg/agent/cniserver/ipam"
@@ -76,9 +78,11 @@ type podConfigurator struct {
7678 // isSecondaryNetwork is true if this instance of podConfigurator is used to configure
7779 // Pod secondary network interfaces.
7880 isSecondaryNetwork bool
81+ podIfMonitor * podIfaceMonitor
7982}
8083
8184func newPodConfigurator (
85+ kubeClient clientset.Interface ,
8286 ovsBridgeClient ovsconfig.OVSBridgeClient ,
8387 ofClient openflow.Client ,
8488 routeClient route.Interface ,
@@ -88,11 +92,13 @@ func newPodConfigurator(
8892 isOvsHardwareOffloadEnabled bool ,
8993 disableTXChecksumOffload bool ,
9094 podUpdateNotifier channel.Notifier ,
95+ podLister v1.PodLister ,
9196) (* podConfigurator , error ) {
9297 ifConfigurator , err := newInterfaceConfigurator (ovsDatapathType , isOvsHardwareOffloadEnabled , disableTXChecksumOffload )
9398 if err != nil {
9499 return nil , err
95100 }
101+ ifMonitor := newPodInterfaceMonitor (kubeClient , podLister , ofClient , ifaceStore , podUpdateNotifier )
96102 return & podConfigurator {
97103 ovsBridgeClient : ovsBridgeClient ,
98104 ofClient : ofClient ,
@@ -101,6 +107,7 @@ func newPodConfigurator(
101107 gatewayMAC : gatewayMAC ,
102108 ifConfigurator : ifConfigurator ,
103109 podUpdateNotifier : podUpdateNotifier ,
110+ podIfMonitor : ifMonitor ,
104111 }, nil
105112}
106113
@@ -166,13 +173,13 @@ func getContainerIPsString(ips []net.IP) string {
166173// not created for a Pod interface.
167174func ParseOVSPortInterfaceConfig (portData * ovsconfig.OVSPortData , portConfig * interfacestore.OVSPortConfig ) * interfacestore.InterfaceConfig {
168175 if portData .ExternalIDs == nil {
169- klog .V (2 ).Infof ("OVS port %s has no external_ids" , portData .Name )
176+ klog .V (2 ).InfoS ("OVS port has no external_ids" , "port "portData .Name )
170177 return nil
171178 }
172179
173180 containerID , found := portData .ExternalIDs [ovsExternalIDContainerID ]
174181 if ! found {
175- klog .V (2 ).Infof ("OVS port %s has no %s in external_ids" , portData .Name , ovsExternalIDContainerID )
182+ klog .V (2 ).InfoS ("OVS port has no containerID in external_ids" , "port" , portData .Name )
176183 return nil
177184 }
178185
@@ -187,8 +194,7 @@ func ParseOVSPortInterfaceConfig(portData *ovsconfig.OVSPortData, portConfig *in
187194
188195 containerMAC , err := net .ParseMAC (portData .ExternalIDs [ovsExternalIDMAC ])
189196 if err != nil {
190- klog .Errorf ("Failed to parse MAC address from OVS external config %s: %v" ,
191- portData .ExternalIDs [ovsExternalIDMAC ], err )
197+ klog .ErrorS (err , "Failed to parse MAC address from OVS external config" )
192198 }
193199 podName , _ := portData .ExternalIDs [ovsExternalIDPodName ]
194200 podNamespace , _ := portData .ExternalIDs [ovsExternalIDPodNamespace ]
@@ -279,7 +285,7 @@ func (pc *podConfigurator) createOVSPort(ovsPortName string, ovsAttachInfo map[s
279285func (pc * podConfigurator ) removeInterfaces (containerID string ) error {
280286 containerConfig , found := pc .ifaceStore .GetContainerInterface (containerID )
281287 if ! found {
282- klog .V (2 ).Infof ("Did not find the port for container %s in local cache" , containerID )
288+ klog .V (2 ).InfoS ("Did not find the port for container in local cache" , "container "containerID )
283289 return nil
284290 }
285291
@@ -498,7 +504,7 @@ func (pc *podConfigurator) reconcile(pods []corev1.Pod, containerAccess *contain
498504// disconnectInterfaceFromOVS disconnects an existing interface from ovs br-int.
499505func (pc * podConfigurator ) disconnectInterfaceFromOVS (containerConfig * interfacestore.InterfaceConfig ) error {
500506 containerID := containerConfig .ContainerID
501- klog .V (2 ).Infof ("Deleting Openflow entries for container %s " , containerID )
507+ klog .V (2 ).InfoS ("Deleting Openflow entries for container" , "container "containerID )
502508 if ! pc .isSecondaryNetwork {
503509 if err := pc .ofClient .UninstallPodFlows (containerConfig .InterfaceName ); err != nil {
504510 return fmt .Errorf ("failed to delete Openflow entries for container %s: %v" , containerID , err )
@@ -513,6 +519,12 @@ func (pc *podConfigurator) disconnectInterfaceFromOVS(containerConfig *interface
513519 if err := pc .ovsBridgeClient .DeletePort (containerConfig .PortUUID ); err != nil {
514520 return fmt .Errorf ("failed to delete OVS port for container %s interface %s: %v" , containerID , containerConfig .InterfaceName , err )
515521 }
522+
523+ // Remove unready Pod info from local cache when Pod is deleted. This is called only on Windows.
524+ if pc .podIfMonitor != nil {
525+ pc .podIfMonitor .deleteUnreadyPod (containerConfig .InterfaceName )
526+ }
527+
516528 // Remove container configuration from cache.
517529 pc .ifaceStore .DeleteInterface (containerConfig )
518530 if ! pc .isSecondaryNetwork {
@@ -558,7 +570,7 @@ func (pc *podConfigurator) connectInterceptedInterface(
558570func (pc * podConfigurator ) disconnectInterceptedInterface (podName , podNamespace , containerID string ) error {
559571 containerConfig , found := pc .ifaceStore .GetContainerInterface (containerID )
560572 if ! found {
561- klog .V (2 ).Infof ("Did not find the port for container %s in local cache" , containerID )
573+ klog .V (2 ).InfoS ("Did not find the port for container in local cache" , "container "containerID )
562574 return nil
563575 }
564576 for _ , ip := range containerConfig .IPs {
0 commit comments