Skip to content

Resolved merge conflicts by aligning e2e test helpers with the updated upstream signatures that now require context.Context. #1327

@vitrixLab

Description

@vitrixLab

Resolved merge conflicts by aligning e2e test helpers with the updated upstream signatures that now require context.Context.

Specifically:

  • Added context.TODO() to e2e helper calls (WaitForLoadBalancer, Run, UpdateService, TestReachableHTTP, WaitForLoadBalancerDestroy) to match current function signatures.
  • Removed duplicate variable declaration for loadBalancerCreateTimeout.
  • Preserved existing test logic and behavior; changes are limited to signature compatibility and conflict cleanup only.

No functional changes to test semantics—this is a mechanical resolution to keep the cherry-picked commits compatible with release-1.31.

Backport upstream commits #1153, #1161, #1215, #1217, #1214 to release-1.31.

Conflict resolution details:

  • Updated calls to match upstream API signatures that now require context.Context, applying context.TODO() where appropriate.
  • Removed duplicate variable declaration for loadBalancerCreateTimeout.
  • No functional changes were introduced — existing test logic and behavior are preserved.
  • All tests pass after resolving conflicts.

These changes ensure the cherry-picked fixes cleanly apply to the release-1.31 branch and maintain compatibility with upstream helper signatures.

Originally posted by @vitrixLab in #1318 (review)

Metadata

Metadata

Assignees

No one assigned

    Labels

    needs-triageIndicates an issue or PR lacks a `triage/foo` label and requires one.

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions