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.

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

Server-Side Apply status wiping #99661

Merged
merged 2 commits into from Mar 10, 2021
Merged

Server-Side Apply status wiping #99661

merged 2 commits into from Mar 10, 2021

Conversation

kevindelgado
Copy link
Contributor

What type of PR is this?

/kind bug

What this PR does / why we need it:

Implements kubernetes/enhancements#1123
Adds the ResetFieldsProvider interface and implements it for all strategies.

Which issue(s) this PR fixes:

Fixes #75564

Does this PR introduce a user-facing change?

FieldManager no longer owns fields that get reset before the object is persisted (e.g. "status wiping").

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

- [KEP]: https://github.com/kubernetes/enhancements/pull/1123

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. 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. labels Mar 2, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @kevindelgado. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/dependency Issues or PRs related to dependency changes area/test kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Mar 2, 2021
@k8s-ci-robot k8s-ci-robot requested review from apelisse, caesarxuchao and a team March 2, 2021 22:51
@kevindelgado
Copy link
Contributor Author

/assign @liggitt

We need to fix one broken test case in status_test, but wanted to get your eyes on this in the meantime @liggitt to begin reviewing this approach to status wiping.

The first commit is from @kwiesmueller work from back in July #92809
and we've recently added some fixes to broken test cases (second commit in the PR onwards).

cc @apelisse

@apelisse
Copy link
Member

apelisse commented Mar 2, 2021

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Mar 2, 2021
@kevindelgado
Copy link
Contributor Author

/test pull-kubernetes-e2e-kind

@kevindelgado
Copy link
Contributor Author

/test pull-kubernetes-integration

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kevindelgado, lavalamp

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 Mar 9, 2021
@kevindelgado
Copy link
Contributor Author

Does this need to have a 1.21 milestone label in order to land in the release @apelisse?

@apelisse
Copy link
Member

apelisse commented Mar 9, 2021

I don't think it does, but it wouldn't hurt

@apelisse apelisse added this to the v1.21 milestone Mar 9, 2021
apelisse
apelisse reviewed Mar 9, 2021
View reviewed changes
Copy link
Member

@apelisse apelisse left a comment

Choose a reason for hiding this comment

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

Looks good, awesome work to both Kevin :-)
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 9, 2021
@lavalamp
Copy link
Member

/milestone v1.21
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021
@lavalamp
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021
kevindelgado and others added 2 commits March 10, 2021 01:02
@kevindelgado
Make conditions list on CRDStatus non-atomic
d66477d
@kevindelgado
Server-Side Apply: Status Wiping/Reset Fields
a1fac8c 
Adds and implements ResetFieldsProvder interface in order to ensure that
the fieldmanager no longer owns fields that get reset before the object
is persisted.

Co-authored-by: Kevin Wiesmueller <kwiesmul@redhat.com>
Co-authored-by: Kevin Delgado <kevindelgado@google.com>
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021
@apelisse
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 10, 2021
@kwiesmueller
Copy link
Member

Thanks for finishing the job!

@lavalamp lavalamp removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 10, 2021
@lavalamp
Copy link
Member

I manually removed the "needs-rebase" label, I'm not sure why the bot didn't.

@k8s-ci-robot k8s-ci-robot merged commit b7d23d7 into kubernetes:master Mar 10, 2021
@kevindelgado kevindelgado mentioned this pull request Mar 10, 2021
Merged
@liggitt liggitt moved this from Assigned to API review completed, 1.21 in API Reviews Apr 6, 2021
@timebertt timebertt mentioned this pull request May 27, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@apelisse apelisse apelisse left review comments

@kwiesmueller kwiesmueller kwiesmueller left review comments

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@lavalamp lavalamp Awaiting requested review from lavalamp

Assignees

@lavalamp lavalamp

@apelisse apelisse

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/dependency Issues or PRs related to dependency changes area/test 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. 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. sig/auth Categorizes an issue or PR as relevant to SIG Auth. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
API Reviews
Status: API review completed, 1.21
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.

server-side apply takes ownership of fields that don't get set due to status wiping
8 participants
@kevindelgado @k8s-ci-robot @apelisse @fejta-bot @caesarxuchao @liggitt @lavalamp @kwiesmueller