From 3b02c8514d7a8f9cedf5865435997810aa0203a6 Mon Sep 17 00:00:00 2001
From: Antonio Ojea <antonio.ojea.garcia@gmail.com>
Date: Wed, 29 May 2019 10:44:12 +0200
Subject: [PATCH 1/2] Document how to enable feature gates

---
 site/content/docs/user/quick-start.md | 44 +++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/site/content/docs/user/quick-start.md b/site/content/docs/user/quick-start.md
index 6dc0241933..8466195df2 100644
--- a/site/content/docs/user/quick-start.md
+++ b/site/content/docs/user/quick-start.md
@@ -242,6 +242,49 @@ nodes:
 - role: worker
 ```
 
+### Enable Feature Gates in Your Cluster
+
+Feature gates are a set of key=value pairs that describe alpha or experimental features. In order to enable a gate you have to [customize your kubeadm configuration][customize control plane with kubeadm], and it will depend on what gate and component you want to enable. An example kind config can be:
+
+```
+# this config file contains all config fields with comments
+kind: Cluster
+apiVersion: kind.sigs.k8s.io/v1alpha3
+# patch the generated kubeadm config with some extra settings
+kubeadmConfigPatches:
+- |
+  apiVersion: kubeadm.k8s.io/v1beta1
+  kind: ClusterConfiguration
+  metadata:
+    name: config
+  apiServer:
+    extraArgs:
+      "feture-gates": "FeatureGateName=true"
+  scheduler:
+    extraArgs:
+      "feture-gates": "FeatureGateName=true"
+  controllerManager:
+    extraArgs:
+      "feture-gates": "FeatureGateName=true"
+- |
+  apiVersion: kubeadm.k8s.io/v1beta1
+  kind: InitConfiguration
+  metadata:
+    name: config
+  nodeRegistration:
+    kubeletExtraArgs:
+      "feture-gates": "FeatureGateName=true"
+# 1 control plane node and 3 workers
+nodes:
+# the control plane node config
+- role: control-plane
+# the three workers
+- role: worker
+- role: worker
+- role: worker
+```
+
+
 ### Configure kind to use a proxy
 If you are running kind in an environment that requires a proxy, you may need to configure kind to use it.
 
@@ -303,3 +346,4 @@ kind, the Kubernetes cluster itself, etc.
 [CGO]: https://golang.org/cmd/cgo/
 [Kubernetes imagePullPolicy]: https://kubernetes.io/docs/concepts/containers/images/#updating-images
 [Private Registries]: /docs/user/private-registries
+[customize control plane with kubeadm]: https://kubernetes.io/docs/setup/independent/control-plane-flags/

From 87130291b269660dbdef345d20b3c5879782164f Mon Sep 17 00:00:00 2001
From: Antonio Ojea <6450081+aojea@users.noreply.github.com>
Date: Sun, 2 Jun 2019 20:38:53 +0200
Subject: [PATCH 2/2] Fix typos

---
 site/content/docs/user/quick-start.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/site/content/docs/user/quick-start.md b/site/content/docs/user/quick-start.md
index 8466195df2..45f529b15f 100644
--- a/site/content/docs/user/quick-start.md
+++ b/site/content/docs/user/quick-start.md
@@ -259,13 +259,13 @@ kubeadmConfigPatches:
     name: config
   apiServer:
     extraArgs:
-      "feture-gates": "FeatureGateName=true"
+      "feature-gates": "FeatureGateName=true"
   scheduler:
     extraArgs:
-      "feture-gates": "FeatureGateName=true"
+      "feature-gates": "FeatureGateName=true"
   controllerManager:
     extraArgs:
-      "feture-gates": "FeatureGateName=true"
+      "feature-gates": "FeatureGateName=true"
 - |
   apiVersion: kubeadm.k8s.io/v1beta1
   kind: InitConfiguration
@@ -273,7 +273,7 @@ kubeadmConfigPatches:
     name: config
   nodeRegistration:
     kubeletExtraArgs:
-      "feture-gates": "FeatureGateName=true"
+      "feature-gates": "FeatureGateName=true"
 # 1 control plane node and 3 workers
 nodes:
 # the control plane node config