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

Fixes from #10278 #10280

Merged
merged 1 commit into from
Sep 12, 2018
Merged

Fixes from #10278 #10280

merged 1 commit into from
Sep 12, 2018

Conversation

zacharysarah
Copy link
Contributor

This PR:

/assign @zparnold @MistyHacks

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 12, 2018
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Sep 12, 2018
@zacharysarah
Copy link
Contributor Author

@zparnold As none of these changes are particularly pressing, feel free to change this PR's base to release-1.12 and (eventually) kill two birds with one stone. ⚾️ 🐦 💀

@k8sio-netlify-preview-bot
Copy link
Collaborator

k8sio-netlify-preview-bot commented Sep 12, 2018

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

Built with commit 457f464

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

Copy link
Contributor

@mdlinville mdlinville left a comment

Choose a reason for hiding this comment

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

A few nits, then this will be ready.

@@ -107,7 +107,7 @@ this example.

If you already have a CA then the only action that is copying the CA's `crt` and
`key` file to `/etc/kubernetes/pki/etcd/ca.crt` and
`/etc/kubernetes/pki/etcd/ca.key`. After those files have been copied, please
`/etc/kubernetes/pki/etcd/ca.key`. After those files have been copied,
proceed to "Create certificates for each member".
Copy link
Contributor

Choose a reason for hiding this comment

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

One more, link to this step instead of quoting the title.

Copy link
Contributor Author

@zacharysarah zacharysarah Sep 12, 2018

Choose a reason for hiding this comment

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

Because it's a step and not a header, we'd have to create an anchor in order to link to it. That seems excessive, and like a path to reduced readability. Instead, I'd suggest:

proceed to the next step ("Create certificates for each member").

UPDATE: Even better:

proceed to the next step, "Create certificates for each member".

WDYT?

Copy link
Contributor

Choose a reason for hiding this comment

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

Sure, or just "continue to the next step"? If it is literally the next step, that seems adequate.

@@ -419,7 +419,7 @@ Note that on some Linux platforms, you may need to manually install the
`conntrack` package which is a dependency of kube-proxy, or else kube-proxy
cannot be started successfully.

For more details on debugging kube-proxy problems, please refer to
For more details on debugging kube-proxy problems, refer to
Copy link
Contributor

Choose a reason for hiding this comment

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

s/on/about

Feedback from mistyhacks

Update configure-upgrade-etcd.md

Update configure-upgrade-etcd.md
@zparnold
Copy link
Member

/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 Sep 12, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: zparnold

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 Sep 12, 2018
@zparnold zparnold merged commit ee35f45 into kubernetes:master Sep 12, 2018
@zacharysarah zacharysarah deleted the 10278-review-fixes branch September 12, 2018 22:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants