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 verbs reporting in kube-apiserver metrics #93523

Merged
merged 1 commit into from
Aug 30, 2020
Merged

Fix verbs reporting in kube-apiserver metrics #93523

merged 1 commit into from
Aug 30, 2020
+20 −17

Conversation

wojtek-t
Copy link
Member

Ref #81660 (comment)

Fix incorrectly reported verbs for kube-apiserver metrics for CRD objects

/assign @smarterclayton

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 29, 2020
@wojtek-t wojtek-t mentioned this pull request Jul 29, 2020
Merged
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver 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. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 29, 2020
@wojtek-t wojtek-t added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jul 29, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Jul 29, 2020
@brancz
Copy link
Member

brancz commented Jul 29, 2020 •
edited
Loading

looks good from instrumentation side

/lgtm

@wojtek-t wojtek-t force-pushed the fix_metrics_reporting branch from 8b000ff to 1406317 Compare July 29, 2020 10:33
@wojtek-t
Copy link
Member Author

@brancz - updated the canonicalVerb function to fix a valid unit test issue (previously it wasn't used in MonitorRequest at all)

@wojtek-t
Copy link
Member Author

Seems like unrelated error in controller-manager.

/retest

logicalhan
logicalhan reviewed Jul 30, 2020
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
Comment on lines -309 to -311
if !validRequestMethods.Has(verb) {
verb = OtherRequestMethod
}
Copy link
Member

Choose a reason for hiding this comment

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

I think we still need this bit actually. This was put in place due to a security vulnerability.

Copy link
Member

Choose a reason for hiding this comment

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

There is no comment to that effect because it was patched prior to the embargo being lifted, but we should probably add a comment here.

Copy link
Member Author

Choose a reason for hiding this comment

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

cleanVerb is doing that - it's no longer needed after adding

Copy link
Member

Choose a reason for hiding this comment

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

ah nice, i was thinking it may make sense to push that down.

logicalhan
logicalhan approved these changes Jul 30, 2020
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
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 30, 2020
@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

@fedebongio
Copy link
Contributor

/remove-triage needs-information

@k8s-ci-robot
Copy link
Contributor

@fedebongio: Those labels are not set on the issue: triage/needs-information

In response to this:

/remove-triage needs-information

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@justaugustus justaugustus added this to the v1.20-phase-bug milestone Aug 26, 2020
@justaugustus
Copy link
Member

/test pull-kubernetes-e2e-kind-ipv6

@k8s-ci-robot k8s-ci-robot merged commit 74b0476 into kubernetes:master Aug 30, 2020
@github-actions github-actions bot mentioned this pull request Sep 3, 2020
Open
@tosi3k tosi3k mentioned this pull request Oct 14, 2020
Closed
@wojtek-t wojtek-t mentioned this pull request Oct 14, 2020
Merged
@odinuge odinuge mentioned this pull request Oct 29, 2024
Open
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

@jpbetz jpbetz Awaiting requested review from jpbetz

Assignees

@logicalhan logicalhan

@smarterclayton smarterclayton

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.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.
7 participants
@wojtek-t @brancz @k8s-ci-robot @fedebongio @justaugustus @logicalhan @smarterclayton