Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade websocket failure add extra error info #127485

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Upgrade websocket failure add extra error info #127485

merged 1 commit into from
Oct 11, 2024

Conversation

seans3
Copy link
Contributor

@seans3 seans3 commented Sep 19, 2024

  • For WebSocket upgrade failure add extra error information from the response body (if it exists).
    • A similar dynamic already happens for the SPDY upgrade failure case.

/kind cleanup

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 19, 2024
@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 19, 2024
@seans3
Copy link
Contributor Author

seans3 commented Sep 19, 2024

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 19, 2024
@seans3 seans3 force-pushed the websocket-upgrade-error-info branch from 08bf960 to 63b6d0b Compare September 19, 2024 23:47
@seans3
Copy link
Contributor Author

seans3 commented Sep 20, 2024

/retest

@seans3
Copy link
Contributor Author

seans3 commented Sep 20, 2024

/assign @liggitt

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 29, 2024
@seans3 seans3 force-pushed the websocket-upgrade-error-info branch from 63b6d0b to 9f3663d Compare October 4, 2024 03:23
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 4, 2024
@seans3 seans3 force-pushed the websocket-upgrade-error-info branch from 9f3663d to 6ed9e95 Compare October 4, 2024 04:29
@seans3
Copy link
Contributor Author

seans3 commented Oct 4, 2024

/retest

@seans3 seans3 force-pushed the websocket-upgrade-error-info branch from 6ed9e95 to 491611a Compare October 4, 2024 07:36
@aojea
Copy link
Member

aojea commented Oct 4, 2024

pull-kubernetes-integration — Job failed.                     BaseSHA:6df3b28f22c3984fa5a35267dd1bf47129ef5b93

#127830

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 4, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 66e9498bd445ff589006adb7e4c2d2dd8617a5b8

@aojea
Copy link
Member

aojea commented Oct 4, 2024

/test pull-kubernetes-integration

liggitt
liggitt reviewed Oct 10, 2024
View reviewed changes
Copy link
Member

@liggitt liggitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one nit, then lgtm

staging/src/k8s.io/client-go/transport/websocket/roundtripper.go Outdated
responseError := ""
responseErrorBytes, readErr := io.ReadAll(io.LimitReader(resp.Body, 64*1024))
if readErr != nil {
cause = fmt.Errorf("%w (unable to read error from server response)", cause)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
cause = fmt.Errorf("%w (unable to read error from server response)", cause)
cause = fmt.Errorf("%w: unable to read error from server response", cause)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@seans3 seans3 force-pushed the websocket-upgrade-error-info branch from 491611a to eec2be8 Compare October 10, 2024 22:55
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2024
@k8s-ci-robot k8s-ci-robot requested review from aojea and liggitt October 10, 2024 22:55
@liggitt
Copy link
Member

liggitt commented Oct 10, 2024

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b21c795a58e03a8c28ffb172572ca63200646d62

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, seans3

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

The pull request process is described here

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 Oct 10, 2024
@k8s-ci-robot k8s-ci-robot merged commit 5c96d8d into kubernetes:master Oct 11, 2024
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.32 milestone Oct 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t Awaiting requested review from wojtek-t

@aojea aojea Awaiting requested review from aojea

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@liggitt liggitt

@aojea aojea

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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.32
Development

Successfully merging this pull request may close these issues.
4 participants
@seans3 @aojea @k8s-ci-robot @liggitt