From 3d31a4a955b32e8dfce566ddb159f74edbc7f906 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Sat, 14 Dec 2019 14:08:06 -0500 Subject: [PATCH] Fix automatic merge from github. --- site/content/en/docs/Installation/helm.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/site/content/en/docs/Installation/helm.md b/site/content/en/docs/Installation/helm.md index 7d3735e758..90ca440aec 100644 --- a/site/content/en/docs/Installation/helm.md +++ b/site/content/en/docs/Installation/helm.md @@ -36,11 +36,7 @@ _We recommend to install Agones in its own namespaces (like `agones-system` as s you can use the helm `--namespace` parameter to specify a different namespace._ When running in production, Agones should be scheduled on a dedicated pool of nodes, distinct from where Game Servers are scheduled for better isolation and resiliency. By default Agones prefers to be scheduled on nodes labeled with `agones.dev/agones-system=true` and tolerates node taint `agones.dev/agones-system=true:NoExecute`. If no dedicated nodes are available, Agones will -<<<<<<< HEAD run on regular nodes, but that's not recommended for production use. For instructions on setting up a dedicated node -======= -run on regular nodes, but that's not recommended for production use. For instructions on setting up a decidated node ->>>>>>> Review feedback. pool for Agones, see the [Agones installation instructions]({{< relref "../_index.md" >}}) for your preferred environment. The command deploys Agones on the Kubernetes cluster with the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.