fix

Author: 08volt

pkg/l4lb/l4netlbcontroller.go

@@ -17,6 +17,7 @@ limitations under the License.
 package l4lb
 
 import (
+	ctx "context"
 	"fmt"
 	"math/rand"
 	"reflect"
@@ -29,13 +30,15 @@ import (
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"github.com/google/go-cmp/cmp"
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/ingress-gce/pkg/annotations"
 	"k8s.io/ingress-gce/pkg/backends"
 	"k8s.io/ingress-gce/pkg/common/operator"
 	"k8s.io/ingress-gce/pkg/context"
+
 	"k8s.io/ingress-gce/pkg/flags"
 	"k8s.io/ingress-gce/pkg/forwardingrules"
 	"k8s.io/ingress-gce/pkg/instancegroups"
@@ -59,7 +62,7 @@ const (
 	instanceGroupLink backendLinkType = 0
 	negLink           backendLinkType = 1
 
-	delayDurationForLegacyOwnershipPriority := 5 * time.Second  // Configurable via flag if needed
+	delayDurationForLegacyOwnershipPriority = 5 * time.Second // Configurable via flag if needed
 )
 
 type backendLinkType int64
@@ -416,13 +419,13 @@ func (lc *L4NetLBController) isRBSBasedService(svc *v1.Service, svcLogger klog.L
 }
 
 func (lc *L4NetLBController) hasLegacyControllerOwnership(svc *v1.Service, svcLogger klog.Logger) bool {
-    // Check for legacy finalizer
-    if utils.HasL4NetLBFinalizerV1(svc) {
-        return true
-    }
+	// Check for legacy finalizer
+	if utils.HasL4NetLBFinalizerV1(svc) {
+		return true
+	}
 
-    // Check if forwarding rule points to a target pool
-    return lc.hasTargetPoolForwardingRule(svc, svcLogger)
+	// Check if forwarding rule points to a target pool
+	return lc.hasTargetPoolForwardingRule(svc, svcLogger)
 }
 
 // refreshServiceFromK8s fetches the latest version of the service from Kubernetes
@@ -434,7 +437,7 @@ func (lc *L4NetLBController) refreshServiceFromK8s(service *v1.Service, svcLogge
 
 	// Get the latest service from Kubernetes
 	refreshedService, err := lc.ctx.KubeClient.CoreV1().Services(service.Namespace).Get(
-		context.TODO(),
+		ctx.TODO(),
 		service.Name,
 		metav1.GetOptions{},
 	)
@@ -453,7 +456,7 @@ func (lc *L4NetLBController) refreshServiceFromK8s(service *v1.Service, svcLogge
 func (lc *L4NetLBController) preventLegacyServiceHandling(service *v1.Service, key string, svcLogger klog.Logger) (bool, error) {
 	svcLogger.Info("Checking for legacy target pool service with RBS annotation or finalizers", "finalizers", service.ObjectMeta.Finalizers)
 	if lc.isRBSBasedService(service, svcLogger) && lc.hasLegacyControllerOwnership(service, svcLogger) {
-		if utils.HasL4NetLBFinalizerV2(service) || utils.HasL4NetLBFinalizerV3(service) {
+		if utils.HasL4NetLBRBSFinalizers(service) {
 			// If we found that RBS finalizer was attached to service, it means that RBS controller
 			// had a race condition on Service creation with Legacy Controller.
 			// It should only happen during service creation, and we should clean up RBS resources
@@ -675,9 +678,7 @@ func (lc *L4NetLBController) syncInternal(service *v1.Service, svcLogger klog.Lo
 		svcLogger.Info("Finished syncing L4 NetLB RBS service", "timeTaken", time.Since(startTime))
 	}()
 
-	hasRBSFinalizer := utils.HasL4NetLBFinalizerV2(service) || utils.HasL4NetLBFinalizerV3(service)
-
-	if !hasRBSFinalizer && lc.enableRBSDefault {
+	if !utils.HasL4NetLBRBSFinalizers(service) && lc.enableRBSDefault {
 		// Add a delay to allow legacy controller to potentially claim the service first
 
 		svcLogger.Info("Service does not have RBS finalizer yet and RBS is default. Adding delay to allow legacy controller to act first",

pkg/utils/utils.go

@@ -766,6 +766,11 @@ func HasL4NetLBFinalizerV1(svc *api_v1.Service) bool {
 	return slice.ContainsString(svc.ObjectMeta.Finalizers, common.NetLBFinalizerV1, nil)
 }
 
+// HasL4NetLBRBSFinalizers returns true if the given Service has any of the NetLBRBS finalizers v2 or v3
+func HasL4NetLBRBSFinalizers(svc *api_v1.Service) bool {
+	return HasL4NetLBFinalizerV2(svc) || HasL4NetLBFinalizerV3(svc)
+}
+
 // HasL4NetLBFinalizerV2 returns true if the given Service has NetLBFinalizerV2
 func HasL4NetLBFinalizerV2(svc *api_v1.Service) bool {
 	return slice.ContainsString(svc.ObjectMeta.Finalizers, common.NetLBFinalizerV2, nil)