github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +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> \

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

@ -121,169 +121,167 @@
" #! /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", " units:\n",
" public-ip: $public_ipv4\n", " - name: setup-network-environment.service\n",
"units:\n", " command: start\n",
" - name: setup-network-environment.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=Setup Network Environment\n",
" [Unit]\n", " Documentation=https://github.com/kelseyhightower/setup-network-environment\n",
" Description=Setup Network Environment\n", " Requires=network-online.target\n",
" Documentation=https://github.com/kelseyhightower/setup-network-environment\n", " After=network-online.target\n\n",
" Requires=network-online.target\n", " [Service]\n",
" After=network-online.target\n\n", " ExecStartPre=/usr/bin/mkdir -p /opt/bin\n",
" [Service]\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/setup-network-environment\n",
" ExecStartPre=/usr/bin/mkdir -p /opt/bin\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/setup-network-environment\n", " ExecStart=/opt/bin/setup-network-environment\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/setup-network-environment\n", " RemainAfterExit=yes\n",
" ExecStart=/opt/bin/setup-network-environment\n", " Type=oneshot\n",
" RemainAfterExit=yes\n", " - name: etcd.service\n",
" Type=oneshot\n", " command: start\n",
" - name: etcd.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=etcd\n",
" [Unit]\n", " Requires=setup-network-environment.service\n",
" Description=etcd\n", " After=setup-network-environment.service\n\n",
" Requires=setup-network-environment.service\n", " [Service]\n",
" After=setup-network-environment.service\n\n", " EnvironmentFile=/etc/network-environment\n",
" [Service]\n", " User=etcd\n",
" EnvironmentFile=/etc/network-environment\n", " PermissionsStartOnly=true\n",
" User=etcd\n", " ExecStart=/usr/bin/etcd \\\n",
" PermissionsStartOnly=true\n", " --name $private_ipv4 \\\n",
" ExecStart=/usr/bin/etcd \\\n", " --addr $private_ipv4:4001 \\\n",
" --name $public_ipv4 \\\n", " --bind-addr 0.0.0.0 \\\n",
" --addr $public_ipv4:4001 \\\n", " --cluster-active-size 1 \\\n",
" --bind-addr 0.0.0.0 \\\n", " --data-dir /var/lib/etcd \\\n",
" --cluster-active-size 1 \\\n", " --http-read-timeout 86400 \\\n",
" --data-dir /var/lib/etcd \\\n", " --peer-addr $private_ipv4:7001 \\\n",
" --http-read-timeout 86400 \\\n", " --snapshot true\n",
" --peer-addr $public_ipv4:7001 \\\n", " Restart=always\n",
" --snapshot true\n", " RestartSec=10s\n",
" Restart=always\n", " - name: fleet.socket\n",
" RestartSec=10s\n", " command: start\n",
" - name: fleet.socket\n", " content: |\n",
" command: start\n", " [Socket]\n",
" content: |\n", " ListenStream=/var/run/fleet.sock\n",
" [Socket]\n", " - name: fleet.service\n",
" ListenStream=/var/run/fleet.sock\n", " command: start\n",
" - name: fleet.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=fleet daemon\n",
" [Unit]\n", " Wants=etcd.service\n",
" Description=fleet daemon\n", " After=etcd.service\n",
" Wants=etcd.service\n", " Wants=fleet.socket\n",
" After=etcd.service\n", " After=fleet.socket\n\n",
" Wants=fleet.socket\n", " [Service]\n",
" After=fleet.socket\n\n", " Environment=\"FLEET_ETCD_SERVERS=http://127.0.0.1:4001\"\n",
" [Service]\n", " Environment=\"FLEET_METADATA=role=master\"\n",
" Environment=\"FLEET_ETCD_SERVERS=http://127.0.0.1:4001\"\n", " ExecStart=/usr/bin/fleetd\n",
" Environment=\"FLEET_METADATA=role=master\"\n", " Restart=always\n",
" ExecStart=/usr/bin/fleetd\n", " RestartSec=10s\n",
" Restart=always\n", " - name: etcd-waiter.service\n",
" RestartSec=10s\n", " command: start\n",
" - name: etcd-waiter.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=etcd waiter\n",
" [Unit]\n", " Wants=network-online.target\n",
" Description=etcd waiter\n", " Wants=etcd.service\n",
" Wants=network-online.target\n", " After=etcd.service\n",
" Wants=etcd.service\n", " After=network-online.target\n",
" After=etcd.service\n", " Before=flannel.service\n",
" After=network-online.target\n", " Before=setup-network-environment.service\n\n",
" Before=flannel.service\n", " [Service]\n",
" Before=setup-network-environment.service\n\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n",
" [Service]\n", " ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/waiter.sh\n", " RemainAfterExit=true\n",
" ExecStart=/usr/bin/bash /opt/bin/waiter.sh\n", " Type=oneshot\n",
" RemainAfterExit=true\n", " - name: flannel.service\n",
" Type=oneshot\n", " command: start\n",
" - name: flannel.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Requires=etcd-waiter.service\n",
" [Unit]\n", " After=etcd-waiter.service\n",
" Requires=etcd-waiter.service\n", " Requires=etcd.service\n",
" After=etcd-waiter.service\n", " After=etcd.service\n",
" Requires=etcd.service\n", " After=network-online.target\n",
" After=etcd.service\n", " Wants=network-online.target\n",
" After=network-online.target\n", " Description=flannel is an etcd backed overlay network for containers\n\n",
" Wants=network-online.target\n", " [Service]\n",
" Description=flannel is an etcd backed overlay network for containers\n\n", " Type=notify\n",
" [Service]\n", " ExecStartPre=-/usr/bin/mkdir -p /opt/bin\n",
" Type=notify\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld\n",
" ExecStartPre=-/usr/bin/mkdir -p /opt/bin\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/flanneld\n", " ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{\"Network\":\"10.244.0.0/16\"}'\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/flanneld\n", " ExecStart=/opt/bin/flanneld\n",
" ExecStartPre=-/usr/bin/etcdctl mk /coreos.com/network/config '{\"Network\":\"10.244.0.0/16\"}'\n", " - name: kube-apiserver.service\n",
" ExecStart=/opt/bin/flanneld\n", " command: start\n",
" - name: kube-apiserver.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=Kubernetes API Server\n",
" [Unit]\n", " Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n",
" Description=Kubernetes API Server\n", " Requires=etcd.service\n",
" Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n", " After=etcd.service\n\n",
" Requires=etcd.service\n", " [Service]\n",
" After=etcd.service\n\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-apiserver\n",
" [Service]\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-apiserver\n", " ExecStart=/opt/bin/kube-apiserver \\\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-apiserver\n", " --address=0.0.0.0 \\\n",
" ExecStart=/opt/bin/kube-apiserver \\\n", " --port=8080 \\\n",
" --address=0.0.0.0 \\\n", " --portal_net 10.244.0.0/16 \\\n",
" --port=8080 \\\n", " --etcd_servers=http://127.0.0.1:4001 \\\n",
" --portal_net 10.244.0.0/16 \\\n", " --public_address_override=$private_ipv4 \\\n",
" --etcd_servers=http://127.0.0.1:4001 \\\n", " --logtostderr=true\n",
" --public_address_override=$private_ipv4 \\\n", " Restart=always\n",
" --logtostderr=true\n", " RestartSec=10\n",
" Restart=always\n", " - name: kube-controller-manager.service\n",
" RestartSec=10\n", " command: start\n",
" - name: kube-controller-manager.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=Kubernetes Controller Manager\n",
" [Unit]\n", " Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n",
" Description=Kubernetes Controller Manager\n", " Requires=kube-apiserver.service\n",
" Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n", " After=kube-apiserver.service\n\n",
" Requires=kube-apiserver.service\n", " [Service]\n",
" After=kube-apiserver.service\n\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-controller-manager\n",
" [Service]\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-controller-manager\n", " ExecStart=/opt/bin/kube-controller-manager \\\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-controller-manager\n", " --master=127.0.0.1:8080 \\\n",
" ExecStart=/opt/bin/kube-controller-manager \\\n", " --logtostderr=true\n",
" --master=127.0.0.1:8080 \\\n", " Restart=always\n",
" --logtostderr=true\n", " RestartSec=10\n",
" Restart=always\n", " - name: kube-scheduler.service\n",
" RestartSec=10\n", " command: start\n",
" - name: kube-scheduler.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=Kubernetes Scheduler\n",
" [Unit]\n", " Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n",
" Description=Kubernetes Scheduler\n", " Requires=kube-apiserver.service\n",
" Documentation=https://github.com/GoogleCloudPlatform/kubernetes\n", " After=kube-apiserver.service\n\n",
" Requires=kube-apiserver.service\n", " [Service]\n",
" After=kube-apiserver.service\n\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-scheduler\n",
" [Service]\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/kubernetes-release/release/v0.8.1/bin/linux/amd64/kube-scheduler\n", " ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-scheduler\n", " Restart=always\n",
" ExecStart=/opt/bin/kube-scheduler --master=127.0.0.1:8080\n", " RestartSec=10\n",
" Restart=always\n", " - name: kube-register.service\n",
" RestartSec=10\n", " command: start\n",
" - name: kube-register.service\n", " content: |\n",
" command: start\n", " [Unit]\n",
" content: |\n", " Description=Kubernetes Registration Service\n",
" [Unit]\n", " Documentation=https://github.com/kelseyhightower/kube-register\n",
" Description=Kubernetes Registration Service\n", " Requires=kube-apiserver.service\n",
" Documentation=https://github.com/kelseyhightower/kube-register\n", " After=kube-apiserver.service\n\n",
" Requires=kube-apiserver.service\n", " Requires=fleet.service\n",
" After=kube-apiserver.service\n\n", " After=fleet.service\n\n",
" Requires=fleet.service\n", " [Service]\n",
" After=fleet.service\n\n", " ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/kube-register\n",
" [Service]\n", " ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register\n",
" ExecStartPre=/usr/bin/wget -N -P /opt/bin https://storage.googleapis.com/k8s/kube-register\n", " ExecStart=/opt/bin/kube-register \\\n",
" ExecStartPre=/usr/bin/chmod +x /opt/bin/kube-register\n", " --metadata=role=knode \\\n",
" ExecStart=/opt/bin/kube-register \\\n", " --fleet-endpoint=unix:///var/run/fleet.sock \\\n",
" --metadata=role=knode \\\n", " --api-endpoint=http://127.0.0.1:8080\n",
" --fleet-endpoint=unix:///var/run/fleet.sock \\\n", " Restart=always\n",
" --api-endpoint=http://127.0.0.1:8080\n", " RestartSec=10\n",
" Restart=always\n",
" RestartSec=10\n",
" update:\n", " update:\n",
" group: alpha\n", " group: alpha\n",
" reboot-strategy: off\n" " reboot-strategy: off\n"