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

Merge pull request #10033 from hakman/container-runtime-defaults 

Update Docker version defaults for older k8s versions
This commit is contained in:
Kubernetes Prow Robot 2020-10-10 23:14:47 -07:00 committed by GitHub
parent 9bd14beaa5 dc86205faf
commit 8c6bb14e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,10 +47,8 @@ func (b *DockerOptionsBuilder) BuildOptions(o interface{}) error {
// Set the Docker version for known Kubernetes versions
if fi.StringValue(clusterSpec.Docker.Version) == "" {
if b.IsKubernetesGTE("1.19") {
if b.IsKubernetesGTE("1.17") {
docker.Version = fi.String("19.03.13")
} else if b.IsKubernetesGTE("1.17") {
docker.Version = fi.String("19.03.11")
} else if b.IsKubernetesGTE("1.16") {
docker.Version = fi.String("18.09.9")
} else if b.IsKubernetesGTE("1.12") {

8
tests/integration/update_cluster/privatecalico/cloudformation.json.extracted.yaml
View File

@ -155,7 +155,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope
configOverride: |
disabled_plugins = ["cri"]
logLevel: info
version: 1.2.13
version: 1.3.7
docker:
ipMasq: false
ipTables: false
@ -165,7 +165,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivatecalicoexamplecom.Prope
- max-size=10m
- max-file=5
storage: overlay2,overlay,aufs
version: 19.03.11
version: 19.03.13
encryptionConfig: null
etcdClusters:
events:
@ -490,7 +490,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp
configOverride: |
disabled_plugins = ["cri"]
logLevel: info
version: 1.2.13
version: 1.3.7
docker:
ipMasq: false
ipTables: false
@ -500,7 +500,7 @@ Resources.AWSEC2LaunchTemplatenodesprivatecalicoexamplecom.Properties.LaunchTemp
- max-size=10m
- max-file=5
storage: overlay2,overlay,aufs
version: 19.03.11
version: 19.03.13
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m

4
tests/integration/update_cluster/privatecalico/data/aws_launch_template_master-us-test-1a.masters.privatecalico.example.com_user_data
View File

@ -153,7 +153,7 @@ containerd:
configOverride: |
disabled_plugins = ["cri"]
logLevel: info
version: 1.2.13
version: 1.3.7
docker:
ipMasq: false
ipTables: false
@ -163,7 +163,7 @@ docker:
- max-size=10m
- max-file=5
storage: overlay2,overlay,aufs
version: 19.03.11
version: 19.03.13
encryptionConfig: null
etcdClusters:
events:

4
tests/integration/update_cluster/privatecalico/data/aws_launch_template_nodes.privatecalico.example.com_user_data
View File

@ -153,7 +153,7 @@ containerd:
configOverride: |
disabled_plugins = ["cri"]
logLevel: info
version: 1.2.13
version: 1.3.7
docker:
ipMasq: false
ipTables: false
@ -163,7 +163,7 @@ docker:
- max-size=10m
- max-file=5
storage: overlay2,overlay,aufs
version: 19.03.11
version: 19.03.13
kubeProxy:
clusterCIDR: 100.96.0.0/11
cpuRequest: 100m

2
upup/pkg/fi/cloudup/populatecluster_test.go
View File

@ -394,7 +394,7 @@ func TestPopulateCluster_DockerVersion(t *testing.T) {
},
{
KubernetesVersion: "1.17.0",
DockerVersion: "19.03.11",
DockerVersion: "19.03.13",
},
}