From 4ecc84bbce0b8ae399adc674155cd99643039fee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Albertin?= Date: Wed, 30 May 2018 06:57:53 +0200 Subject: [PATCH] Update high-availability.md (#8783) Fix indentation damaged etcd YAML manifest --- .../setup/independent/high-availability.md | 52 ++++++++++++------- 1 file changed, 34 insertions(+), 18 deletions(-) diff --git a/content/en/docs/setup/independent/high-availability.md b/content/en/docs/setup/independent/high-availability.md index 22200fc2f6..34f4179139 100644 --- a/content/en/docs/setup/independent/high-availability.md +++ b/content/en/docs/setup/independent/high-availability.md @@ -287,51 +287,67 @@ Please select one of the tabs to see installation instructions for the respectiv apiVersion: v1 kind: Pod metadata: - labels: + labels: component: etcd tier: control-plane - name: - namespace: kube-system + name: + namespace: kube-system 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 - --initial-cluster-state new + 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 + - --initial-cluster-state new image: k8s.gcr.io/etcd-amd64:3.1.10 livenessProbe: - httpGet: + httpGet: path: /health port: 2379 scheme: HTTP - initialDelaySeconds: 15 - timeoutSeconds: 15 + initialDelaySeconds: 15 + timeoutSeconds: 15 name: etcd env: - name: PUBLIC_IP - valueFrom: + valueFrom: fieldRef: fieldPath: status.hostIP - name: PRIVATE_IP - valueFrom: + valueFrom: fieldRef: - fieldPath: status.podIP + fieldPath: status.podIP - name: PEER_NAME - valueFrom: + valueFrom: fieldRef: - fieldPath: metadata.name + fieldPath: metadata.name volumeMounts: - mountPath: /var/lib/etcd - name: etcd + name: etcd - mountPath: /certs - name: certs + name: certs hostNetwork: true volumes: - hostPath: path: /var/lib/etcd type: DirectoryOrCreate - name: etcd + name: etcd - hostPath: path: /etc/kubernetes/pki/etcd - name: certs + name: certs EOF ```