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.

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

clean up use of word: just #26472

Merged
merged 1 commit into from
Mar 26, 2021
Merged

clean up use of word: just #26472

merged 1 commit into from
Mar 26, 2021

Conversation

kbhawkey
Copy link
Contributor

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 11, 2021
@kbhawkey kbhawkey changed the title clean up use of word: just [wip]clean up use of word: just Feb 11, 2021
@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/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 11, 2021
@kbhawkey
Copy link
Contributor Author

/kind cleanup

@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Feb 11, 2021
@netlify
Copy link

netlify bot commented Feb 11, 2021 •
edited
Loading

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 3ff5ec1

https://deploy-preview-26472--kubernetes-io-master-staging.netlify.app

@neolit123
Copy link
Member

LGTM on the kubeadm changes.
thanks, this reads better.

kbhawkey
kbhawkey commented Feb 12, 2021
View reviewed changes
content/en/docs/reference/using-api/server-side-apply.md Outdated
@@ -209,7 +209,7 @@ would have failed due to conflicting ownership.

The merging strategy, implemented with Server Side Apply, provides a generally
more stable object lifecycle. Server Side Apply tries to merge fields based on
the fact who manages them instead of overruling just based on values. This way
which objects manage them instead of overruling based on values. This way
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@apelisse .
Would you have time to clarify this sentence? I'd like to replace "the fact who manges" and "just based":

Server Side Apply tries to merge fields based on
the objects managing the fields instead of overruling fields based only on values.
or
Server Side Apply tries to merge fields based on
which objects manage the fields instead of overruling based on values.
or
Server Side Apply tries to merge fields based on
ownership of the fields instead of overruling fields based on values.

Copy link
Member

@apelisse apelisse Feb 13, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Thanks for looking at this, I'm not even sure I fully understand what's meant here :-)

We've spent some time finding the right words for these concepts. In general, we consider fields to be "managed" by "managers". To avoid the repetition, "actors" is also a good option. We used "owned/owners" in the past (as well as workflows but not so much) but we've tried to remove occurrences of these from the code-base.

Server Side Apply tries to merge fields based on the actor who manages them instead of overruling based on values.

EDIT: Removed the just ;-)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for reviewing!

@sftim
Copy link
Contributor

sftim commented Feb 14, 2021

When this isn't WIP I'll be happy to approve it, based on the PR description.

@kbhawkey kbhawkey changed the title [wip]clean up use of word: just clean up use of word: just Feb 15, 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 Feb 15, 2021
@celestehorgan
Copy link
Contributor

Awesome work @kbhawkey! Rebase it and I'll merge.

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 17, 2021
@kbhawkey kbhawkey force-pushed the cleanup-usage-just branch from 3515d4c to 3ff5ec1 Compare March 18, 2021 00:02
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 18, 2021
@tengqm
Copy link
Contributor

tengqm commented Mar 26, 2021

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 195ece4c6908d5355d302841cc70485f4d2de748

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tengqm

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 26, 2021
@k8s-ci-robot k8s-ci-robot merged commit ec48408 into kubernetes:master Mar 26, 2021
@kbhawkey kbhawkey deleted the cleanup-usage-just branch June 23, 2021 01:48
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

@awly awly Awaiting requested review from awly

@bgrant0607 bgrant0607 Awaiting requested review from bgrant0607

Assignees

@tengqm tengqm

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@kbhawkey @neolit123 @sftim @celestehorgan @tengqm @k8s-ci-robot @apelisse