github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 03:03:59 +00:00
Code Issues Projects Releases Wiki Activity

Fixed nits.

Browse Source
This commit is contained in:
Paulo Pires 2015-01-21 23:00:16 +00:00
parent a1a725bdde
commit 078b37cd2f
2 changed files with 165 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/getting-started-guides/aws-coreos.md
View File

@ -64,10 +64,10 @@ aws ec2 authorize-security-group-ingress --group-name kubernetes --source-securi
#### Launch the master #### Launch the master
*Attention:* Replace ```<ami_image_id>``` bellow for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel). *Attention:* Replace ```<ami_image_id>``` below for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel).
``` ```
aws ec2 run-instances --image-id <ami_image_id> —key-name <keypair> \ aws ec2 run-instances --image-id <ami_image_id> --key-name <keypair> \
--region us-west-2 --security-groups kubernetes --instance-type m3.medium \ --region us-west-2 --security-groups kubernetes --instance-type m3.medium \
--user-data file://master.yaml --user-data file://master.yaml
``` ```
@ -103,7 +103,7 @@ Edit `node.yaml` and replace all instances of `<master-private-ip>` with the **p
### Launch 3 worker nodes ### Launch 3 worker nodes
*Attention:* Replace ```<ami_image_id>``` bellow for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel). *Attention:* Replace ```<ami_image_id>``` below for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel).
``` ```
aws ec2 run-instances --count 3 --image-id <ami_image_id> --key-name <keypair> \ aws ec2 run-instances --count 3 --image-id <ami_image_id> --key-name <keypair> \
@ -113,7 +113,7 @@ aws ec2 run-instances --count 3 --image-id <ami_image_id> --key-name <keypair> \
### Add additional worker nodes ### Add additional worker nodes
*Attention:* Replace ```<ami_image_id>``` bellow for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel). *Attention:* Replace ```<ami_image_id>``` below for a [suitable version of CoreOS image for AWS](https://coreos.com/docs/running-coreos/cloud-providers/ec2/#choosing-a-channel).
``` ```
aws ec2 run-instances --count 1 --image-id <ami_image_id> --key-name <keypair> \ aws ec2 run-instances --count 1 --image-id <ami_image_id> --key-name <keypair> \

8
docs/getting-started-guides/aws/cloudformation-template.json
View File

@ -121,8 +121,6 @@
" #! /usr/bin/bash\n", " #! /usr/bin/bash\n",
" until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done\n", " until curl http://127.0.0.1:4001/v2/machines; do sleep 2; done\n",
"coreos:\n", "coreos:\n",
" fleet:\n",
" public-ip: $public_ipv4\n",
" units:\n", " units:\n",
" - name: setup-network-environment.service\n", " - name: setup-network-environment.service\n",
" command: start\n", " command: start\n",
@ -151,13 +149,13 @@
" User=etcd\n", " User=etcd\n",
" PermissionsStartOnly=true\n", " PermissionsStartOnly=true\n",
" ExecStart=/usr/bin/etcd \\\n", " ExecStart=/usr/bin/etcd \\\n",
" --name $public_ipv4 \\\n", " --name $private_ipv4 \\\n",
" --addr $public_ipv4:4001 \\\n", " --addr $private_ipv4:4001 \\\n",
" --bind-addr 0.0.0.0 \\\n", " --bind-addr 0.0.0.0 \\\n",
" --cluster-active-size 1 \\\n", " --cluster-active-size 1 \\\n",
" --data-dir /var/lib/etcd \\\n", " --data-dir /var/lib/etcd \\\n",
" --http-read-timeout 86400 \\\n", " --http-read-timeout 86400 \\\n",
" --peer-addr $public_ipv4:7001 \\\n", " --peer-addr $private_ipv4:7001 \\\n",
" --snapshot true\n", " --snapshot true\n",
" Restart=always\n", " Restart=always\n",
" RestartSec=10s\n", " RestartSec=10s\n",