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

Minor cleanups in watch handler toward unification between http and websockets #122115

Merged
merged 2 commits into from Dec 14, 2023
Merged

Minor cleanups in watch handler toward unification between http and websockets #122115

merged 2 commits into from Dec 14, 2023

Conversation

wojtek-t
Copy link
Member 

NONE

/kind cleanup
/priority important-longterm
/sig api-machinery

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. labels Nov 29, 2023
@k8s-ci-robot
Copy link
Contributor

Please note that we're already in Test Freeze for the release-1.29 branch. This means every merged PR will be automatically fast-forwarded via the periodic ci-fast-forward job to the release branch of the upcoming v1.29.0 release.

Fast forwards are scheduled to happen every 6 hours, whereas the most recent run was: Wed Nov 29 16:05:22 UTC 2023.

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. area/apiserver approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 29, 2023
@wojtek-t wojtek-t mentioned this pull request Nov 29, 2023
Merged
@wojtek-t wojtek-t mentioned this pull request Nov 30, 2023
Closed
jpbetz
jpbetz suggested changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@jpbetz jpbetz left a comment

Choose a reason for hiding this comment

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

Thanks for cleaning this up. Happy to approver after the two (minor) comments I've added are cleared.

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go Outdated
@@ -265,7 +264,7 @@ func (s *WatchServer) ServeHTTP(w http.ResponseWriter, req *http.Request) {
}
}

// HandleWS implements a websocket handler.
// HandleWs serves a series of encoded events over a websocket connection.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// HandleWs serves a series of encoded events over a websocket connection.
// HandleWS serves a series of encoded events over a websocket connection.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/watch.go
return
}

func (s *WatchServer) HandleHTTP(w http.ResponseWriter, req *http.Request) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this rename worth it? It's an exported symbol in a staging repo..

Copy link
Member Author

Choose a reason for hiding this comment

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

I changed slightly what it's doing (e.g. it's not handling websocket now), so changing name helps imho [I doubt someone vendoring this repo is really using that).
But if you feel strongly about leaving the name as it was previously - I can revert it.

@jpbetz
Copy link
Contributor

jpbetz commented Nov 30, 2023

/approve
/lgtm

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

LGTM label has been added.

Git tree hash: bf799fc1f44d2878402c4f7cc8b234c4d552e8ac

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jpbetz, wojtek-t

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 removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2023
@jiahuif
Copy link
Member

jiahuif commented Nov 30, 2023

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Nov 30, 2023
@jpbetz
Copy link
Contributor

jpbetz commented Nov 30, 2023

/lgtm

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

LGTM label has been added.

Git tree hash: a99dbb28c28b78edd04b037d34b2b150b0db6275

@k8s-ci-robot k8s-ci-robot merged commit 3c8241f into kubernetes:master Dec 14, 2023
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.30 milestone Dec 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncdc ncdc Awaiting requested review from ncdc

@sttts sttts Awaiting requested review from sttts

@jpbetz jpbetz Awaiting requested review from jpbetz

Assignees

@jpbetz jpbetz

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. 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.30
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wojtek-t @k8s-ci-robot @jpbetz @jiahuif