github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27676 from justinsb/aws_debian_1_11

Browse Source 
Automatic merge from submit-queue

AWS kube-up: move to Docker 1.11.2

This is to mirror GCE

Also we remove support for vivid as Docker no longer packages for it, and remove some of the unreachable distro code in aws kube-up.

Also bump the AMI to a 1.3 version (with preinstalled Docker 1.11.2)

Fixes https://github.com/kubernetes/kubernetes/issues/27654
This commit is contained in:
k8s-merge-robot
2016-06-21 12:29:03 -07:00
committed by GitHub
parent 459757cf08 0345013dde
commit ee87a39f04
13 changed files with 26 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
cluster/aws/util.sh
View File

@@ -65,10 +65,8 @@ case "${OS_DISTRIBUTION}" in
wily)
;;
vivid)
echo "vivid is currently end-of-life and does not get updates." >&2
echo "Please consider using wily or jessie instead" >&2
echo "(will continue in 10 seconds)" >&2
sleep 10
echo "vivid is no longer supported by kube-up; please use jessie instead" >&2
exit 2
;;
coreos)
echo "coreos is no longer supported by kube-up; please use jessie instead" >&2
@@ -328,18 +326,9 @@ function detect-security-groups {
# AWS_IMAGE
function detect-image () {
case "${OS_DISTRIBUTION}" in
trusty|coreos)
detect-trusty-image
;;
vivid)
detect-vivid-image
;;
wily)
detect-wily-image
;;
wheezy)
detect-wheezy-image
;;
jessie)
detect-jessie-image
;;
@@ -350,72 +339,6 @@ case "${OS_DISTRIBUTION}" in
esac
}
# Detects the AMI to use for trusty (considering the region)
# Used by CoreOS & Ubuntu
#
# Vars set:
# AWS_IMAGE
function detect-trusty-image () {
# 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
# This will need to be updated from time to time as amis are deprecated
if [[ -z "${AWS_IMAGE-}" ]]; then
case "${AWS_REGION}" in
ap-northeast-1)
AWS_IMAGE=ami-93876e93
;;
ap-northeast-2)
AWS_IMAGE=ami-62ac620c
;;
ap-southeast-1)
AWS_IMAGE=ami-66546234
;;
eu-central-1)
AWS_IMAGE=ami-e2a694ff
;;
eu-west-1)
AWS_IMAGE=ami-d7fd6ea0
;;
sa-east-1)
AWS_IMAGE=ami-a357eebe
;;
us-east-1)
AWS_IMAGE=ami-6089d208
;;
us-west-1)
AWS_IMAGE=ami-cf7d998b
;;
cn-north-1)
AWS_IMAGE=ami-d436a4ed
;;
us-gov-west-1)
AWS_IMAGE=ami-01523322
;;
ap-southeast-2)
AWS_IMAGE=ami-cd4e3ff7
;;
us-west-2)
AWS_IMAGE=ami-3b14370b
;;
*)
echo "Please specify AWS_IMAGE directly (region ${AWS_REGION} not recognized)"
exit 1
esac
fi
}
# Detects the RootDevice to use in the Block Device Mapping (considering the AMI)
#
# Vars set: