Skip to content

Commit

Permalink
Fixes from review of PR #10278 (#10280)
Browse files Browse the repository at this point in the history
Feedback from mistyhacks

Update configure-upgrade-etcd.md

Update configure-upgrade-etcd.md
  • Loading branch information
zacharysarah authored and zparnold committed Sep 12, 2018
1 parent 00c0cda commit ee35f45
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
reviewers:
- sig-cluster-lifecycle
title: Set up a High Availability etcd cluster with kubeadm
title: Set up a high availability etcd cluster with kubeadm
content_template: templates/task
weight: 60
---
Expand Down Expand Up @@ -107,8 +107,8 @@ 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
proceed to "Create certificates for each member".
`/etc/kubernetes/pki/etcd/ca.key`. After those files have been copied,
proceed to the next step, "Create certificates for each member".
If you do not already have a CA then run this command on `$HOST0` (where you
generated the configuration files for kubeadm).
Expand Down
6 changes: 3 additions & 3 deletions content/en/docs/setup/scratch.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ We recommend that you use the etcd version which is provided in the Kubernetes b
were tested extensively with this version of etcd and not with any other version.
The recommended version number can also be found as the value of `TAG` in `kubernetes/cluster/images/etcd/Makefile`.

For the miniumum recommended version of etcd, please refer to
For the miniumum recommended version of etcd, refer to
[Configuring and Updating etcd](/docs/tasks/administer-cluster/configure-upgrade-etcd/)

The remainder of the document assumes that the image identifiers have been chosen and stored in corresponding env vars. Examples (replace with latest tags and appropriate registry):
Expand Down Expand Up @@ -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 about debugging kube-proxy problems, refer to
[Debug Services](/docs/tasks/debug-application-cluster/debug-service/)

### Networking
Expand Down Expand Up @@ -864,7 +864,7 @@ pinging or SSH-ing from one node to another.

### Getting Help

If you run into trouble, please see the section on [troubleshooting](/docs/setup/turnkey/gce/#troubleshooting), post to the
If you run into trouble, see the section on [troubleshooting](/docs/setup/turnkey/gce/#troubleshooting), post to the
[kubernetes-users group](https://groups.google.com/forum/#!forum/kubernetes-users), or come ask questions on [Slack](/docs/troubleshooting#slack).

## Support Level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,9 @@ TARGET_VERSION=2.2.1
STORAGE_MEDIA_TYPE=application/json
```

** Note: this upgrade procedure is for getting from 2.x to 3.x. Version `3.0.17` is not recommended for running in production (see [prerequisites](#prereqisites) for minimum recommended etcd versions.
{{< note >}}
**Note:** This procedure upgrades from 2.x to 3.x. Version `3.0.17` is not recommended for running in production (see [prerequisites](#prerequisites) for minimum recommended etcd versions).
{{< /note >}}

## Notes for etcd Version 2.2.1

Expand Down

0 comments on commit ee35f45

Please sign in to comment.