AWS: Set OS defaults for kube 1.2

Default distro is jessie, due to the support situation with Ubuntu
distros.  Default ubuntu distro is wily.

Update the docs to reflect the recommended distros with kube-up, and to
encourage contributions for other distros.
This commit is contained in:
Justin Santa Barbara
2016-02-25 00:10:33 -05:00
parent 9a4e3f8470
commit 4e64c4586e
4 changed files with 19 additions and 9 deletions

View File

@@ -124,7 +124,7 @@ ADMISSION_CONTROL=NamespaceLifecycle,LimitRanger,SecurityContextDeny,ServiceAcco
ENABLE_NODE_PUBLIC_IP=${KUBE_ENABLE_NODE_PUBLIC_IP:-true}
# OS options for minions
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-vivid}"
KUBE_OS_DISTRIBUTION="${KUBE_OS_DISTRIBUTION:-jessie}"
KUBE_NODE_IMAGE="${KUBE_NODE_IMAGE:-}"
COREOS_CHANNEL="${COREOS_CHANNEL:-alpha}"
CONTAINER_RUNTIME="${KUBE_CONTAINER_RUNTIME:-docker}"