Skip to content

Revert "fieldmanager: Strip managedfields BEFORE we update the timestamp" #101061

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
Closed
pacoxu wants to merge 1 commit into from
Closed

Revert "fieldmanager: Strip managedfields BEFORE we update the timestamp" #101061

pacoxu wants to merge 1 commit into from

Conversation

@pacoxu
Copy link
Member

@pacoxu pacoxu commented Apr 13, 2021

Reverts #100032

for testing

@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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. 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. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 13, 2021
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 13, 2021

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pacoxu
To complete the pull request process, please assign jennybuckley after the PR has been reviewed.
You can assign the PR to them by writing /assign @jennybuckley in a comment when ready.

The full list of commands accepted by this bot can be found 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

@pacoxu
Copy link
Member Author

pacoxu commented Apr 13, 2021

/test pull-kubernetes-integration

@pacoxu
Copy link
Member Author

pacoxu commented Apr 13, 2021

#101019 related

@pacoxu
Copy link
Member Author

pacoxu commented Apr 13, 2021

/test pull-kubernetes-integration
3rd run

@kevindelgado kevindelgado mentioned this pull request Apr 13, 2021
Merged
@pacoxu pacoxu changed the title [WIP]Revert "fieldmanager: Strip managedfields BEFORE we update the timestamp" Revert "fieldmanager: Strip managedfields BEFORE we update the timestamp" Apr 13, 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 Apr 13, 2021
@pacoxu
Copy link
Member Author

pacoxu commented Apr 13, 2021

/kind flake
/release-note-none

I think we should revert this change and check why it flakes.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/flake Categorizes issue or PR as related to a flaky test. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Apr 13, 2021
@fedebongio
Copy link
Contributor

fedebongio commented Apr 13, 2021

/assign @apelisse
/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
Copy link
Member

apelisse commented Apr 13, 2021

That's clearly the problem, but we have #101076 that is probably better, thanks!

@apelisse apelisse closed this Apr 13, 2021
@pacoxu pacoxu deleted the revert-100032-strip-before-updating-timestamp branch June 23, 2021 05:48
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

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@apelisse apelisse

Labels

area/apiserver cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/flake Categorizes issue or PR as related to a flaky test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

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