Skip to content

[release-1.6] Close only the gRPC client the request helper owns - #4953

Merged
k8s-ci-robot merged 1 commit into
kubernetes-sigs:release-1.6from
k8s-infra-cherrypick-robot:cherry-pick-4939-to-release-1.6
Jun 8, 2026
Merged

k8s-ci-robot merged 1 commit into
kubernetes-sigs:release-1.6from
k8s-infra-cherrypick-robot:cherry-pick-4939-to-release-1.6

Conversation

@k8s-infra-cherrypick-robot

Copy link
Copy Markdown
Contributor

This is an automated cherry-pick of #4939

/assign rikatz

The gRPC conformance request helper no longer closes a caller-supplied (injected) Options.GRPCClient; it closes only the DefaultClient it creates internally. This lets implementations reuse a custom gRPC client across requests.

MakeRequestAndExpectEventuallyConsistentResponse deferred Close() on the
Client it was passed, including a caller-supplied (injected) suite.GRPCClient
that it does not own. Closing a shared client as a side effect of one request
forces custom clients to tolerate being closed and re-used — an unusual,
undocumented contract, and a real hazard once a test re-uses the injected
client after the helper runs.

Close only the DefaultClient the helper constructs when passed nil; leave a
caller-supplied client open. Behavior is unchanged on the default path.

Signed-off-by: Aleksei Sviridkin <f@lex.la>
@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jun 5, 2026
@k8s-ci-robot
k8s-ci-robot requested review from kflynn and mikemorris June 5, 2026 22:03
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 5, 2026
@rikatz

rikatz commented Jun 8, 2026

Copy link
Copy Markdown
Member

/approve

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: k8s-infra-cherrypick-robot, rikatz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 8, 2026
@rikatz

rikatz commented Jun 8, 2026

Copy link
Copy Markdown
Member

spoke with @bexxmodd

moving forward with this cherry-pick
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 8, 2026
@k8s-ci-robot
k8s-ci-robot merged commit 7b13b57 into kubernetes-sigs:release-1.6 Jun 8, 2026
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants