From 99dbc6d7803f5c23548dc045f5776f7a0a0294d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=B0=AD=E5=86=9B?= <2799194073@qq.com> Date: Thu, 26 Sep 2019 19:25:08 +0800 Subject: [PATCH] clean-up doc,spelling mistakes (#5206) --- contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml | 2 +- docs/dns-stack.md | 2 +- roles/download/tasks/download_file.yml | 2 +- .../cloud_controller/oci/tasks/credentials-check.yml | 2 +- roles/kubernetes-apps/registry/README.md | 2 +- roles/kubespray-defaults/defaults/main.yaml | 2 +- roles/network_plugin/calico/templates/calico-cr.yml.j2 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml b/contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml index 8c1ae3929..dff1f16dd 100644 --- a/contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml +++ b/contrib/vault/roles/vault/tasks/bootstrap/sync_secrets.yml @@ -21,7 +21,7 @@ - name: bootstrap/sync_secrets | Print out warning message if secrets are not available and vault is initialized pause: prompt: > - Vault orchestration may not be able to proceed. The Vault cluster is initialzed, but + Vault orchestration may not be able to proceed. The Vault cluster is initialized, but 'root_token' or 'unseal_keys' were not found in {{ vault_secrets_dir }}. These are needed for many vault orchestration steps. when: vault_cluster_is_initialized and not vault_secrets_available diff --git a/docs/dns-stack.md b/docs/dns-stack.md index be84a882a..47273f877 100644 --- a/docs/dns-stack.md +++ b/docs/dns-stack.md @@ -25,7 +25,7 @@ values lead to poor performance of DNS stack, so please choose it wisely. Custom search domains to be added in addition to the cluster search domains (``default.svc.{{ dns_domain }}, svc.{{ dns_domain }}``). Most Linux systems limit the total number of search domains to 6 and the total length of all search domains -to 256 characters. Depending on the length of ``dns_domain``, you're limitted to less then the total limit. +to 256 characters. Depending on the length of ``dns_domain``, you're limited to less then the total limit. Please note that ``resolvconf_mode: docker_dns`` will automatically add your systems search domains as additional search domains. Please take this into the accounts for the limits. diff --git a/roles/download/tasks/download_file.yml b/roles/download/tasks/download_file.yml index 2aca43d5e..45fc43dcb 100644 --- a/roles/download/tasks/download_file.yml +++ b/roles/download/tasks/download_file.yml @@ -1,6 +1,6 @@ --- - block: - - name: download_file | Starting dowload of file + - name: download_file | Starting download of file debug: msg: "{{ download.url }}" run_once: "{{ download_run_once }}" diff --git a/roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml b/roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml index 7688eef24..1a02281cc 100644 --- a/roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml +++ b/roles/kubernetes-apps/cloud_controller/oci/tasks/credentials-check.yml @@ -49,7 +49,7 @@ - name: "OCI Cloud Controller | Credentials Check | oci_subnet1_id" fail: - msg: "oci_subnet1_id is missing. This is the first subnet to which loadbalancers will be added" + msg: "oci_subnet1_id is missingg. This is the first subnet to which loadbalancers will be added" when: - oci_subnet1_id is not defined or not oci_subnet1_id diff --git a/roles/kubernetes-apps/registry/README.md b/roles/kubernetes-apps/registry/README.md index eccf384a9..3d94af960 100644 --- a/roles/kubernetes-apps/registry/README.md +++ b/roles/kubernetes-apps/registry/README.md @@ -223,7 +223,7 @@ spec: ``` -When modifying replication-controller, service and daemon-set defintions, take +When modifying replication-controller, service and daemon-set definitionss, take care to ensure *unique* identifiers for the rc-svc couple and the daemon-set. Failing to do so will have register the localhost proxy daemon-sets to the upstream service. As a result they will then try to proxy themselves, which diff --git a/roles/kubespray-defaults/defaults/main.yaml b/roles/kubespray-defaults/defaults/main.yaml index dda1f5c74..5bc285a7f 100644 --- a/roles/kubespray-defaults/defaults/main.yaml +++ b/roles/kubespray-defaults/defaults/main.yaml @@ -1,6 +1,6 @@ --- # Use proxycommand if bastion host is in group all -# This change obseletes editing ansible.cfg file depending on bastion existance +# This change obseletes editing ansible.cfg file depending on bastion existence ansible_ssh_common_args: "{% if 'bastion' in groups['all'] %} -o ProxyCommand='ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -W %h:%p {{ hostvars['bastion']['ansible_user'] }}@{{ hostvars['bastion']['ansible_host'] }} {% if ansible_ssh_private_key_file is defined %}-i {{ ansible_ssh_private_key_file }}{% endif %} ' {% endif %}" kube_api_anonymous_auth: true diff --git a/roles/network_plugin/calico/templates/calico-cr.yml.j2 b/roles/network_plugin/calico/templates/calico-cr.yml.j2 index 9e10d8523..cfffce3d3 100644 --- a/roles/network_plugin/calico/templates/calico-cr.yml.j2 +++ b/roles/network_plugin/calico/templates/calico-cr.yml.j2 @@ -103,7 +103,7 @@ rules: - get - list - watch - # These permissions are only requried for upgrade from v2.6, and can + # These permissions are only required for upgrade from v2.6, and can # be removed after upgrade or on fresh installations. - apiGroups: ["crd.projectcalico.org"] resources: