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

Fix metrics reporting for the deprecated watch path #104161

Merged
merged 1 commit into from Aug 5, 2021
Merged

Fix metrics reporting for the deprecated watch path #104161

merged 1 commit into from Aug 5, 2021

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Aug 5, 2021 

Fix kube-apiserver metric reporting for the deprecated watch path of /api/<version>/watch/...

/kind bug
/priority important-soon
/sig api-machinery

/assign @logicalhan

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. 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. labels Aug 5, 2021
wojtek-t
wojtek-t commented Aug 5, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go Outdated
// We correct it manually based on the pass verb from the installer.
if verb == "WATCH" || verb == "LISTWATCH" {
reportedVersb = "WATCH"
}
Copy link
Member Author

Choose a reason for hiding this comment

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

Needs a test still

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels Aug 5, 2021
logicalhan
logicalhan reviewed Aug 5, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go Outdated
// GET /api/{version}/watch/{resource}
// We correct it manually based on the pass verb from the installer.
if verb == "WATCH" || verb == "LISTWATCH" {
reportedVersb = "WATCH"
Copy link
Member

Choose a reason for hiding this comment

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

type reportedVerb

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 5, 2021
@wojtek-t wojtek-t changed the title [WIP] Fix metrics reporting for the deprecated watch path Fix metrics reporting for the deprecated watch path Aug 5, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 5, 2021
@wojtek-t
Copy link
Member Author

wojtek-t commented Aug 5, 2021

@logicalhan - I added a test and fixed compile error :) PTAL

logicalhan
logicalhan reviewed Aug 5, 2021
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
// deprecated path pattern for watch of:
// GET /api/{version}/watch/{resource}
// We correct it manually based on the pass verb from the installer.
if suggestedVerb == "WATCH" || suggestedVerb == "WATCHLIST" {
Copy link
Member

Choose a reason for hiding this comment

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

do we need to check the url directly for the watch segment or is this sufficient?

Copy link
Member

Choose a reason for hiding this comment

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

I checked, this is probably okay.

logicalhan
logicalhan approved these changes Aug 5, 2021
View reviewed changes
Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: logicalhan, 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

@caesarxuchao
Copy link
Member

/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 Aug 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1658e13 into kubernetes:master Aug 5, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Aug 5, 2021
This was referenced Aug 6, 2021
Merged
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Aug 6, 2021
@k8s-ci-robot
Merge pull request #104190 from wojtek-t/automated-cherry-pick-of-#10…
b1d13c9 
…4161-upstream-release-1.21

Automated cherry pick of #104161 upstream release 1.21
k8s-ci-robot added a commit that referenced this pull request Aug 6, 2021
@k8s-ci-robot
Merge pull request #104191 from wojtek-t/automated-cherry-pick-of-#10…
474827f 
…4161-upstream-release-1.20

Automated cherry pick of #104161 upstream release 1.20
k8s-ci-robot added a commit that referenced this pull request Aug 6, 2021
@k8s-ci-robot
Merge pull request #104188 from wojtek-t/automated-cherry-pick-of-#10…
9d000be 
…4161-upstream-release-1.22

Automated cherry pick of #104161 upstream release 1.22
@shyamjvs shyamjvs mentioned this pull request Aug 18, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@logicalhan logicalhan logicalhan approved these changes

@jimmidyson jimmidyson Awaiting requested review from jimmidyson

@sttts sttts Awaiting requested review from sttts

Assignees

@logicalhan logicalhan

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/bug Categorizes issue or PR as related to a bug. 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 Denotes a PR that will be considered when it comes time to generate release notes. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@wojtek-t @k8s-ci-robot @caesarxuchao @logicalhan