Skip to content

Do not update managedFields timestamp when they don't change #95240

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
merged 1 commit into from
Oct 2, 2020
Merged

Do not update managedFields timestamp when they don't change #95240

merged 1 commit into from
Oct 2, 2020

Conversation

apelisse
Copy link
Member

@apelisse apelisse commented Oct 1, 2020

What type of PR is this?
/kind bug

What this PR does / why we need it:
Fixes a bug where extra-diffs are produced (along with occasional extra unneeded etcd storage happen) where the only difference is new value for a field (or what can be detected as a new value but isn't) is given.

Which issue(s) this PR fixes:
Fixes #94121

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

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

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 1, 2020
@apelisse
Copy link
Member Author

apelisse commented Oct 1, 2020

/assign @kwiesmueller @jpbetz

@k8s-ci-robot k8s-ci-robot added 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 Oct 1, 2020
@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Oct 1, 2020
@apelisse
Copy link
Member Author

apelisse commented Oct 1, 2020

/priority important-soon
/sig api-machinery
/wg api-expression

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. wg/api-expression Categorizes an issue or PR as relevant to WG API Expression. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 1, 2020
@k8s-ci-robot k8s-ci-robot added area/apiserver approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 1, 2020
kwiesmueller
kwiesmueller reviewed Oct 1, 2020
View reviewed changes
Copy link
Member

@kwiesmueller kwiesmueller left a comment

Choose a reason for hiding this comment

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

Wasn't the problem explicitly with some int/string stuff? Should we also add a test for that. I thought we already had a test case for the default case that should have worked before.

@kwiesmueller
Copy link
Member

Thanks for clarifying in Slack.
Sounds reasonable.
/lgtm
/approve
(Still needs an update-bazel)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 1, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: apelisse, kwiesmueller

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

@fejta-bot
Copy link

/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 force-pushed the no-field-update-on-nop branch from ca25fb4 to fedc0b7 Compare October 2, 2020 04:32
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 2, 2020
@apelisse
Copy link
Member Author

apelisse commented Oct 2, 2020

/retest

@kwiesmueller
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 Oct 2, 2020
@fejta-bot
Copy link

/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.

@k8s-ci-robot k8s-ci-robot merged commit 3005b6d into kubernetes:master Oct 2, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Oct 2, 2020
@fedebongio
Copy link
Contributor

/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 Oct 15, 2020
@ialidzhikov
Copy link
Contributor

@apelisse , does it make sense to file cherry-picks of this PR?

@apelisse
Copy link
Member Author

Yeah, I'd love to, but have zero available time to do so. Do you want to help? :-)

@apelisse
Copy link
Member Author

That should be somewhat easy to backport since the change is minimal.

@ialidzhikov
Copy link
Contributor

That should be somewhat easy to backport since the change is minimal.

Sure, I am on it. :)

@apelisse
Copy link
Member Author

Thank you so much! Let me know if you have any question!

This was referenced Oct 21, 2020
Merged
Merged
@ialidzhikov
Copy link
Contributor

A short update:

@apelisse
Copy link
Member Author

I'm not surprised that it doesn't automatically merge all the way to 1.17. Thanks for taking a look, feel free to let me know if you have questions about that, I can help you take a look.

@cpanato
Copy link
Member

cpanato commented Nov 5, 2020

@ialidzhikov @apelisse any plans to cherry pick to 1.17? or this fix does not apply for 1.17?
asking because if we will cherry pick for 1.17 i will wait for that and hold the merge for 1.18/1.19 to merge all together

@apelisse
Copy link
Member Author

apelisse commented Nov 5, 2020

OK, we're planning on cherry-picking to 1.17, but it's a little more challenging.

@ialidzhikov How can I help you do that?

@cpanato
Copy link
Member

cpanato commented Nov 27, 2020

@apelisse @ialidzhikov are you still planning to backport this to 1.17?

@apelisse
Copy link
Member Author

I'm pretty sure we need to backport it to 1.17 yeah, I don't know about the timeline.

k8s-ci-robot added a commit that referenced this pull request Nov 30, 2020
@k8s-ci-robot
Merge pull request #95774 from ialidzhikov/automated-cherry-pick-of-#…
1c841d2 
…95240-upstream-release-1.18

Automated cherry pick of #95240: Do not update managedFields timestamp when they don't change
k8s-ci-robot added a commit that referenced this pull request Nov 30, 2020
@k8s-ci-robot
Merge pull request #95773 from ialidzhikov/automated-cherry-pick-of-#…
24e6a03 
…95240-upstream-release-1.19

Automated cherry pick of #95240: Do not update managedFields timestamp when they don't change
@apelisse apelisse mentioned this pull request Dec 9, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kwiesmueller kwiesmueller kwiesmueller left review comments

@liggitt liggitt Awaiting requested review from liggitt

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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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/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. wg/api-expression Categorizes an issue or PR as relevant to WG API Expression.
Projects
None yet
Milestone
v1.20
Development

Successfully merging this pull request may close these issues.

kubectl diff finds differences on time field
8 participants
@apelisse @kwiesmueller @k8s-ci-robot @fejta-bot @fedebongio @ialidzhikov @cpanato @jpbetz