Skip to content
Snippets Groups Projects
Unverified Commit 801bbcbc authored by Rong Zhang's avatar Rong Zhang Committed by GitHub
Browse files

Merge pull request #3591 from AdamDang/patch-1

Fix some typos
parents 90d8f7aa 4560ff73
No related branches found
No related tags found
No related merge requests found
...@@ -72,11 +72,11 @@ Mandatory variables that are common for at least one role (or a node group) can ...@@ -72,11 +72,11 @@ Mandatory variables that are common for at least one role (or a node group) can
`inventory/sample/group_vars/k8s-cluster.yml`. `inventory/sample/group_vars/k8s-cluster.yml`.
There are also role vars for docker, rkt, kubernetes preinstall and master roles. There are also role vars for docker, rkt, kubernetes preinstall and master roles.
According to the [ansible docs](http://docs.ansible.com/ansible/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable), According to the [ansible docs](http://docs.ansible.com/ansible/playbooks_variables.html#variable-precedence-where-should-i-put-a-variable),
those cannot be overriden from the group vars. In order to override, one should use those cannot be overridden from the group vars. In order to override, one should use
the `-e ` runtime flags (most simple way) or other layers described in the docs. the `-e ` runtime flags (most simple way) or other layers described in the docs.
Kubespray uses only a few layers to override things (or expect them to Kubespray uses only a few layers to override things (or expect them to
be overriden for roles): be overridden for roles):
Layer | Comment Layer | Comment
------|-------- ------|--------
......
...@@ -11,7 +11,7 @@ achieve the same goal. ...@@ -11,7 +11,7 @@ achieve the same goal.
Etcd Etcd
---- ----
In order to use an external loadbalancing (L4/TCP or L7 w/ SSL Passthrough VIP), the following variables need to be overriden in group_vars In order to use an external loadbalancing (L4/TCP or L7 w/ SSL Passthrough VIP), the following variables need to be overridden in group_vars
* `etcd_access_addresses` * `etcd_access_addresses`
* `etcd_client_url` * `etcd_client_url`
* `etcd_cert_alt_names` * `etcd_cert_alt_names`
......
...@@ -136,7 +136,7 @@ node_labels: ...@@ -136,7 +136,7 @@ node_labels:
* `audit_log_maxsize`: 100 * `audit_log_maxsize`: 100
* `audit_policy_file`: "{{ kube_config_dir }}/audit-policy/apiserver-audit-policy.yaml" * `audit_policy_file`: "{{ kube_config_dir }}/audit-policy/apiserver-audit-policy.yaml"
By default, the `audit_policy_file` contains [default rules](https://github.com/kubernetes-incubator/kubespray/blob/master/roles/kubernetes/master/templates/apiserver-audit-policy.yaml.j2) that can be overriden with the `audit_policy_custom_rules` variable. By default, the `audit_policy_file` contains [default rules](https://github.com/kubernetes-incubator/kubespray/blob/master/roles/kubernetes/master/templates/apiserver-audit-policy.yaml.j2) that can be overridden with the `audit_policy_custom_rules` variable.
##### Custom flags for Kube Components ##### Custom flags for Kube Components
For all kube components, custom flags can be passed in. This allows for edge cases where users need changes to the default deployment that may not be applicable to all deployments. This can be done by providing a list of flags. The `kubelet_node_custom_flags` apply kubelet settings only to nodes and not masters. Example: For all kube components, custom flags can be passed in. This allows for edge cases where users need changes to the default deployment that may not be applicable to all deployments. This can be done by providing a list of flags. The `kubelet_node_custom_flags` apply kubelet settings only to nodes and not masters. Example:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment