From a89dc49c522f3867c42aa8fa10fbf5f2f760485c Mon Sep 17 00:00:00 2001 From: AdamDang Date: Fri, 26 Oct 2018 21:49:57 +0800 Subject: [PATCH 1/3] Update ansible.md --- docs/ansible.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ansible.md b/docs/ansible.md index 21583b5ee..ace7f8ca7 100644 --- a/docs/ansible.md +++ b/docs/ansible.md @@ -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`. 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), -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. Kubespray uses only a few layers to override things (or expect them to -be overriden for roles): +be overridden for roles): Layer | Comment ------|-------- From 477841d8c083460d2fd06390e86273eba0831255 Mon Sep 17 00:00:00 2001 From: AdamDang Date: Fri, 26 Oct 2018 21:55:54 +0800 Subject: [PATCH 2/3] Update ha-mode.md --- docs/ha-mode.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ha-mode.md b/docs/ha-mode.md index e70f99f92..84051c25c 100644 --- a/docs/ha-mode.md +++ b/docs/ha-mode.md @@ -11,7 +11,7 @@ achieve the same goal. 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_client_url` * `etcd_cert_alt_names` From 4560ff73864a3ea0befbeb4d7b285cc35228d305 Mon Sep 17 00:00:00 2001 From: AdamDang Date: Fri, 26 Oct 2018 21:57:04 +0800 Subject: [PATCH 3/3] Update vars.md --- docs/vars.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/vars.md b/docs/vars.md index 279331f1b..84340dfab 100644 --- a/docs/vars.md +++ b/docs/vars.md @@ -136,7 +136,7 @@ node_labels: * `audit_log_maxsize`: 100 * `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 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: