From ee35f4518dd2ceb8d5a4f4386956f62d045d7a70 Mon Sep 17 00:00:00 2001 From: Zach Corleissen Date: Wed, 12 Sep 2018 14:35:43 -0700 Subject: [PATCH] Fixes from review of PR #10278 (#10280) Feedback from mistyhacks Update configure-upgrade-etcd.md Update configure-upgrade-etcd.md --- .../en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md | 6 +++--- content/en/docs/setup/scratch.md | 6 +++--- .../docs/tasks/administer-cluster/configure-upgrade-etcd.md | 4 +++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md b/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md index 576e497da7..dc66ce34f1 100644 --- a/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md +++ b/content/en/docs/setup/independent/setup-ha-etcd-with-kubeadm.md @@ -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 --- @@ -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). diff --git a/content/en/docs/setup/scratch.md b/content/en/docs/setup/scratch.md index 579642ff28..dce95c7b2f 100644 --- a/content/en/docs/setup/scratch.md +++ b/content/en/docs/setup/scratch.md @@ -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): @@ -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 @@ -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 diff --git a/content/en/docs/tasks/administer-cluster/configure-upgrade-etcd.md b/content/en/docs/tasks/administer-cluster/configure-upgrade-etcd.md index f99149c608..8101cff681 100644 --- a/content/en/docs/tasks/administer-cluster/configure-upgrade-etcd.md +++ b/content/en/docs/tasks/administer-cluster/configure-upgrade-etcd.md @@ -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