Skip to content

Chain the field manager creation calls in newDefaultFieldManager #101076

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
Merged
k8s-ci-robot merged 1 commit into from
Apr 14, 2021
Merged

Chain the field manager creation calls in newDefaultFieldManager #101076

k8s-ci-robot merged 1 commit into from
Apr 14, 2021
+25 −15

Conversation

@kevindelgado
Copy link
Contributor

@kevindelgado kevindelgado commented Apr 13, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #101019

Does this PR introduce a user-facing change?

Chain the field manager creation calls in newDefaultFieldManager

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. 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. area/apiserver sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. labels Apr 13, 2021
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. label Apr 13, 2021
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

Per @apelisse's suggestion, we're now chaining together the field manager creation steps in newDefualtFieldManager and NewTestFieldManager, in order to make the order of operations more explicit.

The drawback is that it's a little less clear what the arguments are for each step (and the indenting is kind of ugly). Let me know if this is makes things better or worse (otherwise we can just revert the bug via #101061)

Aside: Isn't this what the builder pattern is for? Not sure if it's worth introducing here if we don't use it elsewhere in k/k, but just a thought.

PTAL @apelisse

@kwiesmueller
Copy link
Member

kwiesmueller commented Apr 13, 2021

I'm not a fan of how this reads, but would live with it for the sake of explicit order :-/

@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

Maybe it would be better just to leave it as is, but comment that the order is reversed.

@apelisse
Copy link
Member

apelisse commented Apr 13, 2021

/ok-to-test
/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Apr 13, 2021
@k8s-ci-robot k8s-ci-robot added lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 13, 2021
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

/retest

1 similar comment
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

/retest

@fedebongio
Copy link
Contributor

fedebongio commented Apr 13, 2021

/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 Apr 13, 2021
@apelisse apelisse mentioned this pull request Apr 13, 2021
Closed
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

/retest

@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

/retest

1 similar comment
@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 13, 2021

/retest

pacoxu
pacoxu approved these changes Apr 14, 2021
View reviewed changes
Copy link
Member

@pacoxu pacoxu 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
Copy link
Contributor

k8s-ci-robot commented Apr 14, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, kevindelgado, pacoxu

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

The pull request process is described here

Details 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

@kevindelgado
Copy link
Contributor Author

kevindelgado commented Apr 14, 2021

/retest

@pacoxu
Copy link
Member

pacoxu commented Apr 14, 2021

👍
There would be fewer flakes after #101006 and #101076 are merged.

@pacoxu
Copy link
Member

pacoxu commented Apr 14, 2021

/test pull-kubernetes-e2e-kind

@k8s-ci-robot k8s-ci-robot merged commit 6cc2799 into kubernetes:master Apr 14, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Apr 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kwiesmueller kwiesmueller Awaiting requested review from kwiesmueller

@sttts sttts Awaiting requested review from sttts

1 more reviewer

@pacoxu pacoxu pacoxu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@apelisse apelisse

@pacoxu pacoxu

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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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. 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.22

Development

Successfully merging this pull request may close these issues.

pull-kubernetes-integration: test-cmd: run_kubectl_diff_tests

6 participants

@kevindelgado @kwiesmueller @apelisse @fedebongio @k8s-ci-robot @pacoxu