From df99f4a3acf6c5b26726519b1291bf8bebf9a67f Mon Sep 17 00:00:00 2001 From: Rebecca Zanzig Date: Wed, 16 Jan 2019 14:31:50 -0800 Subject: [PATCH 1/2] Indent code blocks further to fix list formatting --- website/source/docs/platform/k8s/helm.html.md | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/website/source/docs/platform/k8s/helm.html.md b/website/source/docs/platform/k8s/helm.html.md index aac877f3bd..3c9f631de9 100644 --- a/website/source/docs/platform/k8s/helm.html.md +++ b/website/source/docs/platform/k8s/helm.html.md @@ -157,14 +157,14 @@ and consider if they're appropriate for your deployment. won't request any specific amount of resources. **Setting this is highly recommended.** - ```yaml - # Resources are defined as a formatted multi-line string: - resources: | - requests: - memory: "10Gi" - limits: - memory: "10Gi" - ``` + ```yaml + # Resources are defined as a formatted multi-line string: + resources: | + requests: + memory: "10Gi" + limits: + memory: "10Gi" + ``` - `updatePartition` (`integer: 0`) - This value is used to carefully control a rolling update of Consul server @@ -221,18 +221,18 @@ and consider if they're appropriate for your deployment. If you need to run more pods per node (for example, testing on Minikube), set this value to `null`. - ```yaml - # Recommended default server affinity: - affinity: | - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchLabels: - app: {{ template "consul.name" . }} - release: "{{ .Release.Name }}" - component: server - topologyKey: kubernetes.io/hostname - ``` + ```yaml + # Recommended default server affinity: + affinity: | + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchLabels: + app: {{ template "consul.name" . }} + release: "{{ .Release.Name }}" + component: server + topologyKey: kubernetes.io/hostname + ``` * `client` - Values that configure running a Consul client agent on Kubernetes nodes. @@ -265,14 +265,14 @@ and consider if they're appropriate for your deployment. [ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#resourcerequirements-v1-core) object. If this isn't specified, then the pods won't request any specific amount of resources. - ```yaml - # Resources are defined as a formatted multi-line string: - resources: | - requests: - memory: "10Gi" - limits: - memory: "10Gi" - ``` + ```yaml + # Resources are defined as a formatted multi-line string: + resources: | + requests: + memory: "10Gi" + limits: + memory: "10Gi" + ``` - `extraConfig` (`string: "{}"`) - A raw string of extra JSON or HCL configuration for Consul clients. This From ebba2158918f35432c5279290edb8302bec322f3 Mon Sep 17 00:00:00 2001 From: Rebecca Zanzig Date: Wed, 16 Jan 2019 14:42:12 -0800 Subject: [PATCH 2/2] Fix broken links --- website/source/docs/platform/k8s/helm.html.md | 2 +- website/source/docs/platform/k8s/run.html.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/platform/k8s/helm.html.md b/website/source/docs/platform/k8s/helm.html.md index 3c9f631de9..bffc455e01 100644 --- a/website/source/docs/platform/k8s/helm.html.md +++ b/website/source/docs/platform/k8s/helm.html.md @@ -26,7 +26,7 @@ may still change significantly over time. Please always run Helm with of Consul. This provides a less complicated out-of-box experience for new users, but is not appropriate for a production setup. It is highly recommended to use a properly secured Kubernetes cluster or make sure that you understand and enable -the [recommended security features](/docs/internals/security.html.md). Currently, +the [recommended security features](/docs/internals/security.html). Currently, some of these features are not supported in the Helm chart and require additional manual configuration. diff --git a/website/source/docs/platform/k8s/run.html.md b/website/source/docs/platform/k8s/run.html.md index 2554b77615..8eec5c6e0b 100644 --- a/website/source/docs/platform/k8s/run.html.md +++ b/website/source/docs/platform/k8s/run.html.md @@ -39,7 +39,7 @@ it is highly recommended that you of Consul. This provides a less complicated out-of-box experience for new users, but is not appropriate for a production setup. It is highly recommended to use a properly secured Kubernetes cluster or make sure that you understand and enable -the [recommended security features](/docs/internals/security.html.md). Currently, +the [recommended security features](/docs/internals/security.html). Currently, some of these features are not supported in the Helm chart and require additional manual configuration.