Skip to content

fieldmanager: Strip managedfields BEFORE we update the timestamp #100032

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 9, 2021
Merged

fieldmanager: Strip managedfields BEFORE we update the timestamp #100032

k8s-ci-robot merged 1 commit into from
Apr 9, 2021
+2 −1

Conversation

@apelisse
Copy link
Member

@apelisse apelisse commented Mar 9, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Discovered by #100024

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 9, 2021
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Mar 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse

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

@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
@k8s-ci-robot k8s-ci-robot added 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 Mar 9, 2021
@apelisse
Copy link
Member Author

apelisse commented Mar 9, 2021 •
edited
Loading

Actually that one only updates the time on update. Still thinks this is best.

@fedebongio
Copy link
Contributor

fedebongio commented Mar 9, 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 Mar 9, 2021
@apelisse
Copy link
Member Author

apelisse commented Mar 9, 2021

/assign @jpbetz

@kwiesmueller
Copy link
Member

kwiesmueller commented Mar 10, 2021

/retest

@apelisse
Copy link
Member Author

apelisse commented Mar 12, 2021

/wg api-expression

@k8s-ci-robot k8s-ci-robot added the wg/api-expression Categorizes an issue or PR as relevant to WG API Expression. label Mar 12, 2021
@kwiesmueller
Copy link
Member

kwiesmueller commented Mar 12, 2021

/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 12, 2021
@kwiesmueller
Copy link
Member

kwiesmueller commented Mar 12, 2021

You might also want to do it here:

kubernetes/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/fieldmanager_test.go

Line 114 in 4740173

f = NewStripMetaManager(f)

@jpbetz
Copy link
Contributor

jpbetz commented Mar 12, 2021

/lgtm

Makes perfect sense to me that to detect a noop change, any fields stripping needs to happen first

@apelisse
Copy link
Member Author

apelisse commented Mar 22, 2021

Actually that one only updates the time on update. Still thinks this is best.

I don't know why I said that, it absolutely works for apply too!

https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/fieldmanager/managedfieldsupdater.go#L80

@apelisse apelisse force-pushed the strip-before-updating-timestamp branch from 1b8f227 to c8be965 Compare March 22, 2021 23:29
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 22, 2021
@apelisse
Copy link
Member Author

apelisse commented Mar 22, 2021

the test was already doing the right thing (building the managers in the right order). I've added a "creationTimestamp" to show that this works.

@jpbetz
Copy link
Contributor

jpbetz commented Mar 22, 2021

/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 22, 2021
@fejta-bot
Copy link

fejta-bot commented Mar 23, 2021

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@apelisse apelisse added this to the v1.22 milestone Apr 5, 2021
@k8s-ci-robot k8s-ci-robot merged commit 53fac16 into kubernetes:master Apr 9, 2021
@kevindelgado kevindelgado mentioned this pull request Apr 12, 2021
Closed
@pacoxu pacoxu mentioned this pull request Apr 13, 2021
Closed
@kevindelgado kevindelgado mentioned this pull request Apr 13, 2021
Merged
This was referenced May 26, 2021
Closed
Closed
@astefanutti astefanutti mentioned this pull request May 18, 2022
Merged
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

@jpbetz jpbetz

@kwiesmueller kwiesmueller

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. 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. wg/api-expression Categorizes an issue or PR as relevant to WG API Expression.

Projects

None yet

Milestone

v1.22

Development

Successfully merging this pull request may close these issues.

6 participants

@apelisse @k8s-ci-robot @fedebongio @kwiesmueller @jpbetz @fejta-bot