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.

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

Update user-guide/node-selection/index.md to include pod affinity/anti-affinity #1148

Merged
merged 1 commit into from
Sep 26, 2016

Conversation

davidopp
Copy link
Member

@davidopp davidopp commented Sep 1, 2016

and addd an example. Also clean up user-guide/node-selection/index.md a bit.

I'm not sure why the code include lines aren't working; it seems to be following the directions in
http://kubernetes.io/editdocs/
for how to include text from another file.

@kubernetes/docs to review and hopefully answer the question above

cc/ @kevin-wangzefeng @janetkuo


This change is Reviewable

@devin-donnelly
Copy link
Contributor

Review status: 0 of 4 files reviewed at latest revision, 2 unresolved discussions.


docs/user-guide/node-selection/index.md, line 99 [r1] (raw file):

### Node affinity (alpha feature)

Node affinity was introduced in Kubernetes 1.2. The design doc is [here](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/nodeaffinity.md).

I'd move the design doc link to the end of the section as a "for more information" type thing; lead with what Node Affinity actually does (third sentence).


docs/user-guide/node-selection/index.md, line 131 [r1] (raw file):

### Inter-pod affinity and anti-affinity (alpha feature)

Inter-pod affinity and anti-affinity were introduced in Kubernetes 1.4. The design doc is [here](https://github.com/kubernetes/kubernetes/blob/{{page.githubbranch}}/docs/design/podaffinity.md).

I'd put the design doc link at the end so as not to bury the lead (i.e. what Inter-pod affinity and anti-affinity allow you to do).


Comments from Reviewable

@devin-donnelly
Copy link
Contributor

Docs LGTM pending a couple of suggestions.

@davidopp
Copy link
Member Author

davidopp commented Sep 3, 2016

Updated.

@devin-donnelly
Copy link
Contributor

If we can retarget this PR to the release-1.4 branch, I can merge it now. Otherwise, it'll have to wait until 1.4 goes out.

@devin-donnelly devin-donnelly added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Sep 9, 2016
@kevin-wangzefeng
Copy link
Member

LGTM, thanks!

@devin-donnelly devin-donnelly removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Sep 26, 2016
@davidopp
Copy link
Member Author

New commit pushed.

@davidopp
Copy link
Member Author

OK I was able to resuscitate the files I accidentally deleted. PTAL.

…i-affinity

and addd an example. Also clean up user-guide/node-selection/index.md a bit.
@devin-donnelly
Copy link
Contributor

Looks good. Merging now.

@devin-donnelly devin-donnelly merged commit 1660d47 into kubernetes:master Sep 26, 2016
mikutas pushed a commit to mikutas/k8s-website that referenced this pull request Sep 22, 2022
…rnetes#1148)

Bumps [zentered/markdown-seo-check](https://github.com/zentered/markdown-seo-check) from 1.1.2 to 1.1.3.
- [Release notes](https://github.com/zentered/markdown-seo-check/releases)
- [Commits](zentered/markdown-seo-check@v1.1.2...v1.1.3)

---
updated-dependencies:
- dependency-name: zentered/markdown-seo-check
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants