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

Use right taint key in doc #5188

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Use right taint key in doc #5188

merged 1 commit into from
Oct 4, 2017

Conversation

resouer
Copy link
Contributor

@resouer resouer commented Aug 24, 2017 •
edited
Loading

Use right taint key in kubernetes doc

Part of: kubernetes/kubernetes#51246

DO NOT MERGE until kubernetes/kubernetes#51266 is in!

This change is Reviewable

@resouer resouer requested a review from k82cn August 24, 2017 13:32
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 24, 2017
@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Aug 24, 2017 •
edited
Loading

Deploy preview ready!

Built with commit c81e811

https://deploy-preview-5188--kubernetes-io-master-staging.netlify.com

tengqm
tengqm requested changes Aug 24, 2017
View reviewed changes
Copy link
Contributor

@tengqm tengqm left a comment •
edited by resouer
Loading

Choose a reason for hiding this comment

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

Not understand ...

@tengqm
Copy link
Contributor

tengqm commented Aug 24, 2017 •
edited by resouer
Loading

Sorry my mistake, this has to be applied after kubernetes/kubernetes#51266 is in.
I believe we need to grant some period for these labels to deprecate.

@resouer
Copy link
Contributor Author

resouer commented Aug 24, 2017

kubernetes/kubernetes#51266 is where we are discussing deprecation.

@chenopis chenopis assigned steveperry-53 and unassigned chenopis Aug 24, 2017
k82cn
k82cn reviewed Aug 24, 2017
View reviewed changes
docs/concepts/workloads/controllers/daemonset.md Outdated
@@ -101,7 +101,7 @@ when the pod is created, so it is ignored by the scheduler). Therefore:
Daemon pods do respect [taints and tolerations](/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature),
but they are created with `NoExecute` tolerations for the following taints with no `tolerationSeconds`:

- `node.alpha.kubernetes.io/notReady`
- `node.alpha.kubernetes.io/not-ready`
- `node.alpha.kubernetes.io/unreachable`
- `node.alpha.kubernetes.io/memoryPressure`
Copy link
Member

@k82cn k82cn Aug 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

s/memoryPressure/memory-pressure

and other places.

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, when the time comes to fix the doc, we will need to change diskPressure, outOfDisk as well.
Also this patch has better be rebased on #5048 which is moving taint and toleration into a separate doc.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 25, 2017
k82cn
k82cn reviewed Aug 25, 2017
View reviewed changes
docs/concepts/workloads/controllers/daemonset.md Outdated
- `node.alpha.kubernetes.io/memoryPressure`
- `node.alpha.kubernetes.io/diskPressure`
- `node.alpha.kubernetes.io/memory-pressure`
- `node.alpha.kubernetes.io/disk-pressure`
Copy link
Member

Choose a reason for hiding this comment

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

111:s/outOfDisk/out-of-disk/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ack

@chenopis chenopis added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. Needs Docs Review labels Sep 1, 2017
@resouer resouer mentioned this pull request Sep 11, 2017
Merged
jaypipes
jaypipes approved these changes Sep 28, 2017
View reviewed changes
Copy link
Contributor

@jaypipes jaypipes left a comment

Choose a reason for hiding this comment

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

++

@chenopis
Copy link
Contributor

@resouer Just fix the merge conflict, then this should be ready to merge once kubernetes/kubernetes#51266 is in.

@resouer
Copy link
Contributor Author

resouer commented Sep 29, 2017

@chenopis Yes, I am rebasing and waiting for final review of #51266

@resouer resouer mentioned this pull request Sep 29, 2017
Closed
12 tasks
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 29, 2017
@resouer resouer removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Oct 4, 2017
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 4, 2017
@resouer
Copy link
Contributor Author

resouer commented Oct 4, 2017

@chenopis The code PR has been merged, please review the latest doc.

@steveperry-53 steveperry-53 merged commit 68bf20e into kubernetes:master Oct 4, 2017
@resouer resouer deleted the fix-taint-key branch October 9, 2017 02:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tengqm tengqm tengqm requested changes

@k82cn k82cn k82cn left review comments

@jaypipes jaypipes jaypipes approved these changes

Assignees

@steveperry-53 steveperry-53

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@resouer @k8sio-netlify-preview-bot @tengqm @chenopis @jaypipes @k82cn @steveperry-53 @k8s-ci-robot