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 custom metrics conversion functions #94481

Merged
merged 1 commit into from
Sep 8, 2020
Merged

Fix custom metrics conversion functions #94481

merged 1 commit into from
Sep 8, 2020

Conversation

wojtek-t
Copy link
Member

@wojtek-t wojtek-t commented Sep 3, 2020 •
edited
Loading

Ref #87006

Fix conversions for custom metrics.

/kind cleanup
/priority important-longterm

@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/M Denotes a PR that changes 30-99 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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API labels Sep 3, 2020
@fejta-bot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@wojtek-t
Copy link
Member Author

wojtek-t commented Sep 4, 2020

/retest

@wojtek-t
Copy link
Member Author

wojtek-t commented Sep 4, 2020

@liggitt - PTAL when you will have a chance

liggitt
liggitt reviewed Sep 8, 2020
View reviewed changes
staging/src/k8s.io/metrics/pkg/apis/custom_metrics/v1beta2/zz_generated.conversion.go
@@ -124,8 +124,7 @@ func Convert_custom_metrics_MetricListOptions_To_v1beta2_MetricListOptions(in *c
}

func autoConvert_v1beta2_MetricValue_To_custom_metrics_MetricValue(in *MetricValue, out *custommetrics.MetricValue, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.DescribedObject, &out.DescribedObject, 0); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

was this a bug? would this call actually work in 1.19?

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 thought it would when I was changing that, but you're right - it was a bug.
scope.Convert calls converter:
https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/conversion/converter.go#L183
which in turn were only looking into registered conversions:
https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/conversion/converter.go#L289

which doesn't exist (until this PR).

So yes - it seemed to be a 1.19 bug (it also means we have 0 tests for custom metrics...)

@liggitt
Copy link
Member

liggitt commented Sep 8, 2020

/lgtm
/approve
/sig instrumentation api-machinery
/milestone v1.20

@k8s-ci-robot k8s-ci-robot added sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Sep 8, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Sep 8, 2020
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 8, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, 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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2020
@wojtek-t wojtek-t added kind/bug Categorizes issue or PR as related to a bug. and removed kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Sep 8, 2020
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 8, 2020
@k8s-ci-robot k8s-ci-robot merged commit 3fc1bc7 into kubernetes:master Sep 8, 2020
@wojtek-t wojtek-t changed the title Cleanup custom metrics conversion functions Fix custom metrics conversion functions Sep 9, 2020
This was referenced Sep 9, 2020
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Sep 10, 2020
@k8s-ci-robot
Merge pull request #94654 from wojtek-t/automated-cherry-pick-of-#94481-
52aa885 
#94639-upstream-release-1.19

Automated cherry pick of #94481 #94639 upstream release 1.19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@liggitt liggitt liggitt left review comments

@dchen1107 dchen1107 Awaiting requested review from dchen1107

@gmarek gmarek Awaiting requested review from gmarek

Assignees

@liggitt liggitt

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/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. 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.

None yet
4 participants
@wojtek-t @fejta-bot @liggitt @k8s-ci-robot