diff --git a/docs/aws.md b/docs/aws.md index ef5ed5c08c8fbbbb92fe223fac48558797b455a3..17fd71b49ff4601e7e774ed9542a050899534c8d 100644 --- a/docs/aws.md +++ b/docs/aws.md @@ -5,7 +5,7 @@ To deploy kubespray on [AWS](https://aws.amazon.com/) uncomment the `cloud_provi Prior to creating your instances, you **must** ensure that you have created IAM roles and policies for both "kubernetes-master" and "kubernetes-node". You can find the IAM policies [here](https://github.com/kubernetes-sigs/kubespray/tree/master/contrib/aws_iam/). See the [IAM Documentation](https://aws.amazon.com/documentation/iam/) if guidance is needed on how to set these up. When you bring your instances online, associate them with the respective IAM role. Nodes that are only to be used for Etcd do not need a role. -You would also need to tag the resources in your VPC accordingly for the aws provider to utilize them. Tag the subnets, route tables and all instances that kubernetes will be run on with key `kubernetes.io/cluster/$cluster_name` (`$cluster_name` must be a unique identifier for the cluster). Tag the subnets that must be targetted by external ELBs with the key `kubernetes.io/role/elb` and internal ELBs with the key `kubernetes.io/role/internal-elb`. +You would also need to tag the resources in your VPC accordingly for the aws provider to utilize them. Tag the subnets, route tables and all instances that kubernetes will be run on with key `kubernetes.io/cluster/$cluster_name` (`$cluster_name` must be a unique identifier for the cluster). Tag the subnets that must be targeted by external ELBs with the key `kubernetes.io/role/elb` and internal ELBs with the key `kubernetes.io/role/internal-elb`. Make sure your VPC has both DNS Hostnames support and Private DNS enabled. diff --git a/docs/integration.md b/docs/integration.md index afc6cf603fa6a9f5894fb731bc1885bb6a0e2178..f9503887ab8e39a1cec5bbeff3747fec7f913774 100644 --- a/docs/integration.md +++ b/docs/integration.md @@ -40,7 +40,7 @@ ... ``` -8. Copy and modify configs from kubespray `group_vars` folder to corresponging `group_vars` folder in your existent project. +8. Copy and modify configs from kubespray `group_vars` folder to corresponding `group_vars` folder in your existent project. You could rename *all.yml* config to something else, i.e. *kubespray.yml* and create corresponding group in your inventory file, which will include all hosts groups related to kubernetes setup. 9. Modify your ansible inventory file by adding mapping of your existent groups (if any) to kubespray naming. diff --git a/docs/roadmap.md b/docs/roadmap.md index 55c7b81692876284777a6df766a5cc6f0c3c7ba4..84f2ef0cc71d01854448009428681992c58f0849 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -19,7 +19,7 @@ Kubespray's roadmap - [ ] On AWS autoscaling, multi AZ - [ ] On Azure autoscaling, create loadbalancer [#297](https://github.com/kubespray/kubespray/issues/297) - [ ] On GCE be able to create a loadbalancer automatically (IAM ?) [#280](https://github.com/kubespray/kubespray/issues/280) -- [x] **TLS boostrap** support for kubelet (covered by kubeadm, but not in standard deployment) [#234](https://github.com/kubespray/kubespray/issues/234) +- [x] **TLS bootstrap** support for kubelet (covered by kubeadm, but not in standard deployment) [#234](https://github.com/kubespray/kubespray/issues/234) (related issues: https://github.com/kubernetes/kubernetes/pull/20439 <br> https://github.com/kubernetes/kubernetes/issues/18112) diff --git a/docs/upgrades.md b/docs/upgrades.md index 8e152230bf7d955f88eb92fdbac5258225be180b..ad521725ab4e361397847aac976e7e9e6c68acb1 100644 --- a/docs/upgrades.md +++ b/docs/upgrades.md @@ -47,7 +47,7 @@ git checkout origin/master ansible-playbook upgrade-cluster.yml -b -i inventory/sample/hosts.ini -e kube_version=v1.6.0 ``` -After a successul upgrade, the Server Version should be updated: +After a successful upgrade, the Server Version should be updated: ``` $ kubectl version diff --git a/docs/weave.md b/docs/weave.md index 969c6ea1ecd9e279c716df1a9fff6e7dc49e4430..c0d34c4e7d78a7c295c3a4338f7c8b7c647ad65d 100644 --- a/docs/weave.md +++ b/docs/weave.md @@ -72,7 +72,7 @@ This mode is best to use on static size cluster This mode is best to use on dynamic size cluster -The seed mode also allows multi-clouds and hybrid on-premise/cloud clusters deployement. +The seed mode also allows multi-clouds and hybrid on-premise/cloud clusters deployment. * Switch from consensus mode to seed mode diff --git a/inventory/sample/group_vars/all/oci.yml b/inventory/sample/group_vars/all/oci.yml index 00d9bef6ed78ca7b925985500aae7dfd85d9c758..67d569dbf8343b9e542decba37ab646285ec6c73 100644 --- a/inventory/sample/group_vars/all/oci.yml +++ b/inventory/sample/group_vars/all/oci.yml @@ -8,7 +8,7 @@ # oci_vnc_id: # oci_subnet1_id: # oci_subnet2_id: -## Overide these default/optional behaviors if you wish +## Overrideeeeeeee these default/optional behaviors if you wish # oci_security_list_management: All ## If you would like the controller to manage specific lists per subnet. This is a mapping of subnet ocids to security list ocids. Below are examples. # oci_security_lists: diff --git a/inventory/sample/group_vars/k8s-cluster/k8s-net-canal.yml b/inventory/sample/group_vars/k8s-cluster/k8s-net-canal.yml index 24deb99d10db593d461f0332e22cb05c69227ac9..60b9da72567f3c8a87efd7fa084a2ef838083b82 100644 --- a/inventory/sample/group_vars/k8s-cluster/k8s-net-canal.yml +++ b/inventory/sample/group_vars/k8s-cluster/k8s-net-canal.yml @@ -1,7 +1,7 @@ # see roles/network_plugin/canal/defaults/main.yml # The interface used by canal for host <-> host communication. -# If left blank, then the interface is chosing using the node's +# If left blank, then the interface is choosing using the node's # default route. # canal_iface: "" diff --git a/roles/container-engine/docker/vars/redhat-aarch64.yml b/roles/container-engine/docker/vars/redhat-aarch64.yml index 0bad0593de5c6e92758fb3830104d766b6da67d2..e5891af569d2c4dc9e90d3e6e5b573b4831c378d 100644 --- a/roles/container-engine/docker/vars/redhat-aarch64.yml +++ b/roles/container-engine/docker/vars/redhat-aarch64.yml @@ -1,7 +1,7 @@ --- docker_kernel_min_version: '0' -# overide defaults, missing 17.03 for aarch64 +# Override defaults, missing 17.03 for aarch64 docker_version: '1.13' # http://mirror.centos.org/altarch/7/extras/aarch64/Packages/ diff --git a/roles/network_plugin/canal/defaults/main.yml b/roles/network_plugin/canal/defaults/main.yml index bed66333e815ed3999403eae2106d6a4f048c7c9..cbb0da8d971ed7011cb1fccdb86697a5646a6562 100644 --- a/roles/network_plugin/canal/defaults/main.yml +++ b/roles/network_plugin/canal/defaults/main.yml @@ -1,6 +1,6 @@ --- # The interface used by canal for host <-> host communication. -# If left blank, then the interface is chosing using the node's +# If left blank, then the interface is choosing using the node's # default route. canal_iface: "" diff --git a/roles/network_plugin/canal/templates/canal-config.yaml.j2 b/roles/network_plugin/canal/templates/canal-config.yaml.j2 index ab6c276bd64162903a1fba165ca01c6dde2e8950..cf3818e9ccd6a19e84a70b9390d3efb0a46ac287 100644 --- a/roles/network_plugin/canal/templates/canal-config.yaml.j2 +++ b/roles/network_plugin/canal/templates/canal-config.yaml.j2 @@ -10,7 +10,7 @@ data: etcd_endpoints: "{{ etcd_access_addresses }}" # The interface used by canal for host <-> host communication. - # If left blank, then the interface is chosing using the node's + # If left blank, then the interface is choosing using the node's # default route. flanneld_iface: "{{ canal_iface }}"