diff --git a/cmd/k8s-operator/e2e/connector_test.go b/cmd/k8s-operator/e2e/connector_test.go index 8f1d5ef47..d413b9022 100644 --- a/cmd/k8s-operator/e2e/connector_test.go +++ b/cmd/k8s-operator/e2e/connector_test.go @@ -155,9 +155,6 @@ func TestConnectorSubnetRouter(t *testing.T) { if !slices.Contains(routes.Advertised, route) { return fmt.Errorf("device %s does not advertise %s: %v", deviceID, route, routes.Advertised) } - if !slices.Contains(routes.Enabled, route) { - return fmt.Errorf("route %s not yet enabled on device %s: %v", route, deviceID, routes.Enabled) - } return nil }); err != nil { t.Fatalf("verifying subnet router routes: %v", err) diff --git a/cmd/k8s-operator/e2e/setup.go b/cmd/k8s-operator/e2e/setup.go index 9762e5fb5..8be5f66bf 100644 --- a/cmd/k8s-operator/e2e/setup.go +++ b/cmd/k8s-operator/e2e/setup.go @@ -1086,6 +1086,12 @@ func createOrUpdate(ctx context.Context, cl client.Client, obj client.Object) er if !apierrors.IsAlreadyExists(err) { return err } + current := obj.DeepCopyObject().(client.Object) + if err := cl.Get(ctx, client.ObjectKeyFromObject(obj), current); err != nil { + return err + } + obj.SetResourceVersion(current.GetResourceVersion()) + obj.SetFinalizers(current.GetFinalizers()) return cl.Update(ctx, obj) } return nil