Merge pull request #812 from justinsb/aws_kubeup_fixes
Update AWS docs for 1.3
This commit is contained in:
		
						commit
						1d24f26a77
					
				|  | @ -7,11 +7,11 @@ | ||||||
| ## Prerequisites | ## Prerequisites | ||||||
| 
 | 
 | ||||||
| 1. You need an AWS account. Visit [http://aws.amazon.com](http://aws.amazon.com) to get started | 1. You need an AWS account. Visit [http://aws.amazon.com](http://aws.amazon.com) to get started | ||||||
| 2. Install and configure [AWS Command Line Interface](http://aws.amazon.com/cli) | 2. Install and configure the [AWS Command Line Interface](http://aws.amazon.com/cli) | ||||||
| 3. You need an AWS [instance profile and role](http://docs.aws.amazon.com/IAM/latest/UserGuide/instance-profiles.html) with EC2 full access and S3 full access. | 3. We recommend installing using an account which has full access to the AWS APIs. | ||||||
| 
 | 
 | ||||||
| NOTE: This script use the 'default' AWS profile by default. | NOTE: This script use the 'default' AWS profile by default. | ||||||
| You may explicitly set AWS profile to use using the `AWS_DEFAULT_PROFILE` environment variable: | You may explicitly set the AWS profile to use using the `AWS_DEFAULT_PROFILE` environment variable: | ||||||
| 
 | 
 | ||||||
| ```shell | ```shell | ||||||
| export AWS_DEFAULT_PROFILE=myawsprofile | export AWS_DEFAULT_PROFILE=myawsprofile | ||||||
|  | @ -36,7 +36,7 @@ This process takes about 5 to 10 minutes. Once the cluster is up, the IP address | ||||||
| as well as information about the default services running in the cluster (monitoring, logging, dns). User credentials and security | as well as information about the default services running in the cluster (monitoring, logging, dns). User credentials and security | ||||||
| tokens are written in `~/.kube/config`, they will be necessary to use the CLI or the HTTP Basic Auth. | tokens are written in `~/.kube/config`, they will be necessary to use the CLI or the HTTP Basic Auth. | ||||||
| 
 | 
 | ||||||
| By default, the script will provision a new VPC and a 4 node k8s cluster in us-west-2a (Oregon) with EC2 instances running on Ubuntu. | By default, the script will provision a new VPC and a 4 node k8s cluster in us-west-2a (Oregon) with EC2 instances running on Debian. | ||||||
| You can override the variables defined in [config-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/aws/config-default.sh) to change this behavior as follows: | You can override the variables defined in [config-default.sh](http://releases.k8s.io/{{page.githubbranch}}/cluster/aws/config-default.sh) to change this behavior as follows: | ||||||
| 
 | 
 | ||||||
| ```shell | ```shell | ||||||
|  | @ -52,11 +52,11 @@ export INSTANCE_PREFIX=k8s | ||||||
| 
 | 
 | ||||||
| If you don't specify master and minion sizes, the scripts will attempt to guess | If you don't specify master and minion sizes, the scripts will attempt to guess | ||||||
| the correct size of the master and worker nodes based on `${NUM_NODES}`. In | the correct size of the master and worker nodes based on `${NUM_NODES}`. In | ||||||
| version 1.2 these default are: | version 1.3 these default are: | ||||||
| 
 | 
 | ||||||
| * For the master, for clusters of less than 150 nodes it will use an | * For the master, for clusters of less than 5 nodes it will use an | ||||||
|   `m3.medium`, for clusters of greater than 150 nodes it will use an |   `m3.medium`, for 6-10 nodes it will use an `m3.large`; | ||||||
|   `m3.large`. |   for 11-100 nodes it will use an `m3.xlarge`. | ||||||
| 
 | 
 | ||||||
| * For worker nodes, for clusters less than 50 nodes it will use a `t2.micro`, | * For worker nodes, for clusters less than 50 nodes it will use a `t2.micro`, | ||||||
|   for clusters between 50 and 150 nodes it will use a `t2.small` and for |   for clusters between 50 and 150 nodes it will use a `t2.small` and for | ||||||
|  | @ -95,7 +95,10 @@ NOTE: If using an existing keypair named "kubernetes" then you must set the `AWS | ||||||
| 
 | 
 | ||||||
| ### Alternatives | ### Alternatives | ||||||
| 
 | 
 | ||||||
| CoreOS maintains [a CLI tool](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html), `kube-aws` that will create and manage a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using AWS tools: EC2, CloudFormation and Autoscaling. | * [kops](https://github.com/kubernetes/kops) "kubernetes-ops" is a complete Kubernetes cluster lifecycle management tool, | ||||||
|  |   that supports AWS. | ||||||
|  | 
 | ||||||
|  | * CoreOS maintains [a CLI tool](https://coreos.com/kubernetes/docs/latest/kubernetes-on-aws.html), `kube-aws` that will create and manage a Kubernetes cluster based on [CoreOS](http://www.coreos.com), using AWS tools: EC2, CloudFormation and Autoscaling. | ||||||
| 
 | 
 | ||||||
| ## Getting started with your cluster | ## Getting started with your cluster | ||||||
| 
 | 
 | ||||||
|  | @ -139,10 +142,11 @@ cluster/kube-down.sh | ||||||
| ## Support Level | ## Support Level | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| IaaS Provider        | Config. Mgmt | OS     | Networking  | Docs                                              | Conforms | Support Level | IaaS Provider        | Config. Mgmt | OS            | Networking  | Docs                                          | Conforms | Support Level | ||||||
| -------------------- | ------------ | ------ | ----------  | ---------------------------------------------     | ---------| ---------------------------- | -------------------- | ------------ | ------------- | ----------  | --------------------------------------------- | ---------| ---------------------------- | ||||||
| AWS                  | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/aws)                                 |          | Community | AWS                  | Saltstack    | Debian/Ubuntu | k8s (VPC)   | [docs](/docs/getting-started-guides/aws)      |          | Community ([@justinsb](https://github.com/justinsb)) | ||||||
| AWS                  | Saltstack    | Ubuntu | OVS         | [docs](/docs/getting-started-guides/aws)                                    |          | Community ([@justinsb](https://github.com/justinsb)) | AWS                  | kops         | Debian        | k8s (VPC)   | [docs](https://github.com/kubernetes/kops)    |          | Community ([@justinsb](https://github.com/justinsb)) | ||||||
|  | AWS                  | CoreOS       | CoreOS        | flannel     | [docs](/docs/getting-started-guides/aws)      |          | Community | ||||||
| 
 | 
 | ||||||
| For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart. | For support level information on all solutions, see the [Table of solutions](/docs/getting-started-guides/#table-of-solutions) chart. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -144,7 +144,8 @@ Bare-metal           | custom       | CentOS | _none_      | [docs](/docs/gettin | ||||||
| AWS                  | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | AWS                  | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | ||||||
| OpenStack/HPCloud    | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | OpenStack/HPCloud    | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | ||||||
| Joyent               | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | Joyent               | Juju         | Ubuntu | flannel     | [docs](/docs/getting-started-guides/juju)                                   |          | [Community](https://github.com/whitmo/bundle-kubernetes) ( [@whit](https://github.com/whitmo), [@matt](https://github.com/mbruzek), [@chuck](https://github.com/chuckbutler) ) | ||||||
| AWS                  | Saltstack    | Ubuntu | OVS         | [docs](/docs/getting-started-guides/aws)                                    |          | Community ([@justinsb](https://github.com/justinsb)) | AWS                  | Saltstack    | Debian | AWS         | [docs](/docs/getting-started-guides/aws)                                    |          | Community ([@justinsb](https://github.com/justinsb)) | ||||||
|  | AWS                  | kops         | Debian | AWS         | [docs](https://github.com/kubernetes/kops)                                  |          | Community ([@justinsb](https://github.com/justinsb)) | ||||||
| Bare-metal           | custom       | Ubuntu | Calico      | [docs](/docs/getting-started-guides/ubuntu-calico)                          |          | Community ([@djosborne](https://github.com/djosborne)) | Bare-metal           | custom       | Ubuntu | Calico      | [docs](/docs/getting-started-guides/ubuntu-calico)                          |          | Community ([@djosborne](https://github.com/djosborne)) | ||||||
| Bare-metal           | custom       | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu)                                 |          | Community ([@resouer](https://github.com/resouer), [@WIZARD-CXY](https://github.com/WIZARD-CXY)) | Bare-metal           | custom       | Ubuntu | flannel     | [docs](/docs/getting-started-guides/ubuntu)                                 |          | Community ([@resouer](https://github.com/resouer), [@WIZARD-CXY](https://github.com/WIZARD-CXY)) | ||||||
| libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/getting-started-guides/libvirt-coreos)                         |          | Community ([@lhuard1A](https://github.com/lhuard1A)) | libvirt/KVM          | CoreOS       | CoreOS | libvirt/KVM | [docs](/docs/getting-started-guides/libvirt-coreos)                         |          | Community ([@lhuard1A](https://github.com/lhuard1A)) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue