kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delay overlay2 to 1.11 

Gives us more time to consider image support.
This commit is contained in:
Justin Santa Barbara 2018-06-07 07:31:50 -07:00
parent ef5936d8b5
commit 2b4888a596
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/model/components/docker.go
View File

@ -86,7 +86,13 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
docker.IPMasq = fi.Bool(false) docker.IPMasq = fi.Bool(false)
// Note the alternative syntax... with a comma nodeup will try each of the filesystems in turn // Note the alternative syntax... with a comma nodeup will try each of the filesystems in turn
if b.IsKubernetesGTE("1.10") { if b.IsKubernetesGTE("1.11") {
// TODO(justinsb): figure out whether to use overlay2 on AWS jessie:
// The ContainerOS image now has docker configured to use overlay2 out-of-the-box
// and it is an error to specify the flag twice.
// But Jessie (still our default AWS image) isn't recommended by docker with overlay2
// (though that may be a kernel issue, and we run a custom kernel on our default image)
// But we still need to worry about users running generic AMIs (e.g. stock jessie)
docker.Storage = fi.String("overlay2,overlay,aufs") docker.Storage = fi.String("overlay2,overlay,aufs")
} else { } else {
docker.Storage = fi.String("overlay,aufs") docker.Storage = fi.String("overlay,aufs")