fix gc report error #2886

Author: hongzhen-ma

pkg/controller/gc.go

@@ -685,16 +685,18 @@ func (c *Controller) gcChassis() error {
 }
 
 func (c *Controller) isOVNProvided(providerName string, pod *corev1.Pod) (bool, error) {
-	ls := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, providerName)]
-	subnet, err := c.config.KubeOvnClient.KubeovnV1().Subnets().Get(context.Background(), ls, metav1.GetOptions{})
-	if err != nil {
-		klog.Errorf("parse annotation logical switch %s error %v", ls, err)
-		return false, err
-	}
-	if !strings.HasSuffix(subnet.Spec.Provider, util.OvnProvider) {
-		return false, nil
+	if ls, ok := pod.Annotations[fmt.Sprintf(util.LogicalSwitchAnnotationTemplate, providerName)]; ok {
+		subnet, err := c.subnetsLister.Get(ls)
+		if err != nil {
+			klog.Errorf("parse annotation logical switch %s error %v", ls, err)
+			return false, err
+		}
+		if !strings.HasSuffix(subnet.Spec.Provider, util.OvnProvider) {
+			return false, nil
+		}
+		return true, nil
 	}
-	return true, nil
+	return false, nil
 }
 
 func (c *Controller) getVmLsps() []string {

pkg/controller/vpc_nat_gw_nat.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -578,7 +579,7 @@ func (c *Controller) handleUpdateIptablesFip(key string) error {
 			return err
 		}
 		//  reset eip
-		c.resetIptablesEipQueue.Add(cachedFip.Spec.EIP)
+		c.resetIptablesEipQueue.AddAfter(cachedFip.Spec.EIP, 3*time.Second)
 		return nil
 	}
 	klog.V(3).Infof("handle update fip %s", key)
@@ -759,7 +760,7 @@ func (c *Controller) handleUpdateIptablesDnatRule(key string) error {
 			return err
 		}
 		//  reset eip
-		c.resetIptablesEipQueue.Add(cachedDnat.Spec.EIP)
+		c.resetIptablesEipQueue.AddAfter(cachedDnat.Spec.EIP, 3*time.Second)
 		return nil
 	}
 	klog.V(3).Infof("handle update dnat %s", key)
@@ -947,7 +948,7 @@ func (c *Controller) handleUpdateIptablesSnatRule(key string) error {
 			return err
 		}
 		//  reset eip
-		c.resetIptablesEipQueue.Add(cachedSnat.Spec.EIP)
+		c.resetIptablesEipQueue.AddAfter(cachedSnat.Spec.EIP, 3*time.Second)
 		return nil
 	}
 	klog.V(3).Infof("handle update snat %s", key)