github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #21958 from justinsb/aws_jessie_default

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-29 11:45:30 -08:00
commit 4202dac2dd
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/config-default.sh
View File

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

2
cluster/aws/config-test.sh
View File

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

20
cluster/aws/options.md
View File

@ -79,14 +79,24 @@ 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: `trusty`, `vivid`, `coreos`, `wheezy`, `jessie` The distribution to use. Defaults to `jessie`
Defaults to vivid (Ubuntu Vivid Vervet), which has a modern kernel and does not require updating or a reboot. Supported options:
`coreos` is also a good option. * `jessie`: Debian Jessie, running a custom kubernetes-optimized image. Should
be supported until 2018 by the debian-security team, and until 2020 by the
debian-LTS team.
* `wily`: Ubuntu Wily. Wily is not an LTS release, and OS support is due to
end in July 2016.
* `vivid`: Ubuntu Vivid. Vivid OS support ended in early February 2016.
Other options may require reboots, updates or configuration, and should be used only if you have a compelling Given the support situation, we recommend using Debian Jessie. In Kubernetes
requirement to do so. 1.3 Ubuntu should have their next LTS release out, so we should be able to
recommend Ubuntu again at that time.
Using kube-up with other operating systems is neither supported nor
recommended. But we would welcome increased OS support for kube-up, so please
contribute!
**NON_MASQUERADE_CIDR** **NON_MASQUERADE_CIDR**

4
cluster/aws/util.sh
View File

@ -48,9 +48,9 @@ MASTER_DISK_ID=
# Well known tags # Well known tags
TAG_KEY_MASTER_IP="kubernetes.io/master-ip" TAG_KEY_MASTER_IP="kubernetes.io/master-ip"
# Defaults: ubuntu -> vivid # Defaults: ubuntu -> wily
if [[ "${KUBE_OS_DISTRIBUTION}" == "ubuntu" ]]; then if [[ "${KUBE_OS_DISTRIBUTION}" == "ubuntu" ]]; then
KUBE_OS_DISTRIBUTION=vivid KUBE_OS_DISTRIBUTION=wily
fi fi
# For GCE script compatibility # For GCE script compatibility