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

AWS: Treat ubuntu as an alias for 'latest ubuntu', i.e. 'vivid'

Browse Source
This commit is contained in:
Justin Santa Barbara 2015-06-24 23:13:17 -04:00
parent dfac73d31a
commit c78b71d399
7 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/jessie/util.sh
View File

@ -17,7 +17,7 @@
# A library of helper functions for Jessie. # A library of helper functions for Jessie.
source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh" source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
SSH_USER=admin SSH_USER=admin

9
cluster/aws/options.md
View File

@ -76,8 +76,13 @@ If your machines don't have any ephemeral disks, this will default to the aufs d
**KUBE_OS_DISTRIBUTION** **KUBE_OS_DISTRIBUTION**
The distribution to use. Valid options: `wheezy`, `ubuntu`, `coreos`. The distribution to use. Valid options: `trusty`, `vivid`, `coreos`, `wheezy`, `jessie`
Defaults to wheezy (Debian Wheezy), which is the same as is used by default on GCE. Defaults to vivid (Ubuntu Vivid Vervet), which has a modern kernel and does not require updating or a reboot.
`coreos` is also a good option.
Other options may require reboots, updates or configuration, and should be used only if you have a compelling
requirement to do so.
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/aws/options.md?pixel)]() [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/aws/options.md?pixel)]()

0
cluster/aws/ubuntu/common.sh → cluster/aws/trusty/common.sh
View File

4
cluster/aws/ubuntu/util.sh → cluster/aws/trusty/util.sh
View File

@ -15,9 +15,7 @@
# limitations under the License. # limitations under the License.
# A library of helper functions for Ubuntu. source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
# TODO: Move image detection in here once it is no longer shared with CoreOS # TODO: Move image detection in here once it is no longer shared with CoreOS

15
cluster/aws/util.sh
View File

@ -30,8 +30,13 @@ ASG_NAME="${NODE_INSTANCE_PREFIX}-group"
# We could allow the master disk volume id to be specified in future # We could allow the master disk volume id to be specified in future
MASTER_DISK_ID= MASTER_DISK_ID=
# Defaults: ubuntu -> vivid
if [[ "${KUBE_OS_DISTRIBUTION}" == "ubuntu" ]]; then
KUBE_OS_DISTRIBUTION=vivid
fi
case "${KUBE_OS_DISTRIBUTION}" in case "${KUBE_OS_DISTRIBUTION}" in
ubuntu|wheezy|jessie|vivid|coreos) trusty|wheezy|jessie|vivid|coreos)
source "${KUBE_ROOT}/cluster/aws/${KUBE_OS_DISTRIBUTION}/util.sh" source "${KUBE_ROOT}/cluster/aws/${KUBE_OS_DISTRIBUTION}/util.sh"
;; ;;
*) *)
@ -221,8 +226,8 @@ function detect-security-groups {
# AWS_IMAGE # AWS_IMAGE
function detect-image () { function detect-image () {
case "${KUBE_OS_DISTRIBUTION}" in case "${KUBE_OS_DISTRIBUTION}" in
ubuntu|coreos) trusty|coreos)
detect-ubuntu-image detect-trusty-image
;; ;;
vivid) vivid)
detect-vivid-image detect-vivid-image
@ -240,12 +245,12 @@ case "${KUBE_OS_DISTRIBUTION}" in
esac esac
} }
# Detects the AMI to use for ubuntu (considering the region) # Detects the AMI to use for trusty (considering the region)
# Used by CoreOS & Ubuntu # Used by CoreOS & Ubuntu
# #
# Vars set: # Vars set:
# AWS_IMAGE # AWS_IMAGE
function detect-ubuntu-image () { function detect-trusty-image () {
# This is the ubuntu 14.04 image for <region>, amd64, hvm:ebs-ssd # This is the ubuntu 14.04 image for <region>, amd64, hvm:ebs-ssd
# See here: http://cloud-images.ubuntu.com/locator/ec2/ for other images # See here: http://cloud-images.ubuntu.com/locator/ec2/ for other images
# This will need to be updated from time to time as amis are deprecated # This will need to be updated from time to time as amis are deprecated

4
cluster/aws/vivid/util.sh
View File

@ -15,9 +15,7 @@
# limitations under the License. # limitations under the License.
# A library of helper functions for Ubuntu. source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh"
SSH_USER=ubuntu SSH_USER=ubuntu

2
cluster/aws/wheezy/util.sh
View File

@ -17,7 +17,7 @@
# A library of helper functions for Wheezy. # A library of helper functions for Wheezy.
source "${KUBE_ROOT}/cluster/aws/ubuntu/common.sh" source "${KUBE_ROOT}/cluster/aws/trusty/common.sh"
SSH_USER=admin SSH_USER=admin