Skip to content

Commit

Permalink
Update docs for --feature-gates (Azure#2081)
Browse files Browse the repository at this point in the history
  • Loading branch information
stuartleeks authored and Terje Torkelsen committed Mar 15, 2018
1 parent 6a98ee6 commit 1fb7e9f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion docs/clusterdefinition.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ Below is a list of kubelet options that acs-engine will configure by default:
|"--image-gc-high-threshold"|"85"|
|"--image-gc-low-threshold"|"850"|
|"--non-masquerade-cidr"|"10.0.0.0/8"|
|"--feature-gates"|No default (can be a comma-separated list). On agent nodes `Accelerators=true` will be applied in the `--feature-gates` option.|

Below is a list of kubelet options that are *not* currently user-configurable, either because a higher order configuration vector is available that enforces kubelet configuration, or because a static configuration is required to build a functional cluster:

Expand All @@ -187,7 +188,6 @@ Below is a list of kubelet options that are *not* currently user-configurable, e
|"--register-with-taints" (master nodes only)|"node-role.kubernetes.io/master=true:NoSchedule"|
|"--read-only-port"|"0"|
|"--keep-terminated-pod-volumes"|"false"|
|"--feature-gates" (agent nodes only)|"Accelerators=true"|

<a name="feat-controller-manager-config"></a>
#### controllerManagerConfig
Expand Down Expand Up @@ -215,6 +215,7 @@ Below is a list of controller-manager options that acs-engine will configure by
|"--pod-eviction-timeout"|"5m0s"|
|"--route-reconciliation-period"|"10s"|
|"--terminated-pod-gc-threshold"|"5000"|
|"--feature-gates"|No default (can be a comma-separated list)|


Below is a list of controller-manager options that are *not* currently user-configurable, either because a higher order configuration vector is available that enforces controller-manager configuration, or because a static configuration is required to build a functional cluster:
Expand Down Expand Up @@ -291,6 +292,7 @@ Below is a list of apiserver options that acs-engine will configure by default:
|apiserver option|default value|
|"--admission-control"|"NamespaceLifecycle, LimitRanger, ServiceAccount, DefaultStorageClass, ResourceQuota, DenyEscalatingExec, AlwaysPullImages, SecurityContextDeny"|
|"--authorization-mode"|"Node", "RBAC" (*the latter if enabledRbac is true*)|
|"--feature-gates"|No default (can be a comma-separated list)|


Below is a list of apiserver options that are *not* currently user-configurable, either because a higher order configuration vector is available that enforces kubelet configuration, or because a static configuration is required to build a functional cluster:
Expand Down

0 comments on commit 1fb7e9f

Please sign in to comment.