clean-up doc,spelling mistakes (#5206)

This commit is contained in:
陈谭军 2019-09-26 19:25:08 +08:00 committed by Kubernetes Prow Robot
parent 75e4cc2fd9
commit 99dbc6d780
7 changed files with 7 additions and 7 deletions

View file

@ -21,7 +21,7 @@
- name: bootstrap/sync_secrets | Print out warning message if secrets are not available and vault is initialized - name: bootstrap/sync_secrets | Print out warning message if secrets are not available and vault is initialized
pause: pause:
prompt: > 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 'root_token' or 'unseal_keys' were not found in {{ vault_secrets_dir }}. These are
needed for many vault orchestration steps. needed for many vault orchestration steps.
when: vault_cluster_is_initialized and not vault_secrets_available when: vault_cluster_is_initialized and not vault_secrets_available

View file

@ -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 }}``). 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 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 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. additional search domains. Please take this into the accounts for the limits.

View file

@ -1,6 +1,6 @@
--- ---
- block: - block:
- name: download_file | Starting dowload of file - name: download_file | Starting download of file
debug: debug:
msg: "{{ download.url }}" msg: "{{ download.url }}"
run_once: "{{ download_run_once }}" run_once: "{{ download_run_once }}"

View file

@ -49,7 +49,7 @@
- name: "OCI Cloud Controller | Credentials Check | oci_subnet1_id" - name: "OCI Cloud Controller | Credentials Check | oci_subnet1_id"
fail: 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: when:
- oci_subnet1_id is not defined or not oci_subnet1_id - oci_subnet1_id is not defined or not oci_subnet1_id

View file

@ -223,7 +223,7 @@ spec:
``` ```
<!-- END MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml --> <!-- END MUNGE: EXAMPLE ../../saltbase/salt/kube-registry-proxy/kube-registry-proxy.yaml -->
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. 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 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 upstream service. As a result they will then try to proxy themselves, which

View file

@ -1,6 +1,6 @@
--- ---
# Use proxycommand if bastion host is in group all # 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 %}" 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 kube_api_anonymous_auth: true

View file

@ -103,7 +103,7 @@ rules:
- get - get
- list - list
- watch - 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. # be removed after upgrade or on fresh installations.
- apiGroups: ["crd.projectcalico.org"] - apiGroups: ["crd.projectcalico.org"]
resources: resources: