From f5cf5c7e4f0468d077e48347bf678a95c791982e Mon Sep 17 00:00:00 2001 From: Jesse Stuart Date: Mon, 11 Jun 2018 04:21:06 -0400 Subject: [PATCH] [docs] Fix syntax formatting in HA-setup doc. Attempts to fix an unformatted code block; whatever markdown parser is being used seems to have gotten tripped up, and as a result the inline `yaml` in the script is interpreted as bullet points... it looks [pretty yucky](http://jstu.art/sAjc). I'm wondering if this is something specific to the Hugo toolchain? Because GH itself recognizes the block as valid, even with the `none` syntax type. If this doesn't trigger a CI build preview, I can test locally to verify. --- .../setup/independent/high-availability.md | 41 +++++++++++-------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/content/en/docs/setup/independent/high-availability.md b/content/en/docs/setup/independent/high-availability.md index ceff01d0ed..3078e8ed0d 100644 --- a/content/en/docs/setup/independent/high-availability.md +++ b/content/en/docs/setup/independent/high-availability.md @@ -266,7 +266,11 @@ Please select one of the tabs to see installation instructions for the respectiv {{% /tab %}} {{% tab name="Static Pods" %}} -**Note**: This is only supported on nodes that have the all dependencies for the kubelet installed. If you are hosting etcd on the master nodes, this has already been set up. If you are hosting etcd on dedicated nodes, you should either use systemd or run the [installation guide](/docs/setup/independent/install-kubeadm/) on each dedicated etcd machine. +**Note**: This is only supported on nodes that have the all dependencies for the +kubelet installed. If you are hosting etcd on the master nodes, this has already +been set up. If you are hosting etcd on dedicated nodes, you should either use +systemd or run the [installation guide](/docs/setup/independent/install-kubeadm/) +on each dedicated etcd machine. Run the following to generate the manifest file: @@ -283,22 +287,22 @@ Run the following to generate the manifest file: spec: containers: - command: - - etcd --name - - --data-dir /var/lib/etcd - - --listen-client-urls http://localhost:2379 - - --advertise-client-urls http://localhost:2379 - - --listen-peer-urls http://localhost:2380 - - --initial-advertise-peer-urls http://localhost:2380 - - --cert-file=/certs/server.pem - - --key-file=/certs/server-key.pem - - --client-cert-auth - - --trusted-ca-file=/certs/ca.pem - - --peer-cert-file=/certs/peer.pem - - --peer-key-file=/certs/peer-key.pem - - --peer-client-cert-auth - - --peer-trusted-ca-file=/certs/ca.pem - - --initial-cluster etcd0=https://:2380,etcd1=https://:2380,etcd2=https://:2380 - - --initial-cluster-token my-etcd-token + - etcd --name + - --data-dir /var/lib/etcd + - --listen-client-urls http://localhost:2379 + - --advertise-client-urls http://localhost:2379 + - --listen-peer-urls http://localhost:2380 + - --initial-advertise-peer-urls http://localhost:2380 + - --cert-file=/certs/server.pem + - --key-file=/certs/server-key.pem + - --client-cert-auth + - --trusted-ca-file=/certs/ca.pem + - --peer-cert-file=/certs/peer.pem + - --peer-key-file=/certs/peer-key.pem + - --peer-client-cert-auth + - --peer-trusted-ca-file=/certs/ca.pem + - --initial-cluster etcd0=https://:2380,etcd1=https://:2380,etcd2=https://:2380 + - --initial-cluster-token my-etcd-token - --initial-cluster-state new image: k8s.gcr.io/etcd-amd64:3.1.10 livenessProbe: @@ -341,6 +345,7 @@ Run the following to generate the manifest file: Make sure you replace: * `` with the name of the node you're running on (e.g. `etcd0`, `etcd1` or `etcd2`) * ``, `` and `` with the public IPv4s of the other machines that host etcd. + {{% /tab %}} {{< /tabs >}} @@ -481,7 +486,7 @@ Ensure that the following placeholders are replaced: {{< note >}}**Note:** If you are using Kubernetes 1.9+, you can replace the `apiserver-count: 3` extra argument with `endpoint-reconciler-type: lease`. For more information, see [the documentation](/docs/admin/high-availability/#endpoint-reconciler).{{< /note >}} -1. When this is done, run kubeadm: +When this is done, run kubeadm: ```bash kubeadm init --config=config.yaml ```