fix(conformance): wrap client with conflict retry for Kubernetes API race conditions

The conformance framework's MustApplyWithCleanup does not retry on
conflict (HTTP 409). When the controller updates resource status
between the framework's read and write, the framework fails with
'object has been modified'. This adds a client.Client wrapper that
re-reads the latest resourceVersion and retries on conflict.

Fixes: BackendTLSPolicyConflictResolution,
BackendTLSPolicyInvalidCACertificateRef,
GatewayHTTPListenerIsolation,
HTTPRouteHTTPSListenerDetectMisdirectedRequests

Author: mahmut-Abi

conformance/conformance_test.go

@@ -3,6 +3,7 @@
 package conformance
 
 import (
+	"context"
 	"io/fs"
 	"os"
 	"path/filepath"
@@ -13,9 +14,11 @@ import (
 	gatewayconformance "sigs.k8s.io/gateway-api/conformance"
 	gatewaytests "sigs.k8s.io/gateway-api/conformance/tests"
 	conformancesuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
 	"github.com/nantian-gw/gateway/internal/gwapi"
+	"k8s.io/client-go/util/retry"
 )
 
 const (
@@ -25,6 +28,7 @@ const (
 
 func TestGatewayAPIConformance(t *testing.T) {
 	options := applyEnvFeatureOptions(gatewayconformance.DefaultOptions(t))
+	options.Client = &conflictRetryClient{Client: options.Client}
 	options, expandedAllFeatures := patchAllFeatures(options)
 
 	manifestFS, err := gatewayAPIManifestFS()
@@ -176,3 +180,21 @@ func parseGatewayAddresses(raw string, fallback string) []gatewayv1beta1.Gateway
 
 	return addresses
 }
+
+type conflictRetryClient struct {
+	client.Client
+}
+
+func (c *conflictRetryClient) Update(ctx context.Context, obj client.Object, opts ...client.UpdateOption) error {
+	key := client.ObjectKeyFromObject(obj)
+	backoff := retry.DefaultBackoff
+
+	return retry.RetryOnConflict(backoff, func() error {
+		latest := obj.DeepCopyObject().(client.Object)
+		if err := c.Client.Get(ctx, key, latest); err != nil {
+			return err
+		}
+		obj.SetResourceVersion(latest.GetResourceVersion())
+		return c.Client.Update(ctx, obj, opts...)
+	})
+}