github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56255 from sbezverk/fix_etcd_version

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56249, 56118, 56255, 56252, 56256). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fixing etcd version for 1.10.X kubernetes

Closes #56254
This commit is contained in:
Kubernetes Submit Queue 2017-11-23 00:23:23 -08:00 committed by GitHub
commit ad4f8a2f67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/constants/constants.go
View File

@ -236,7 +236,7 @@ var (
SupportedEtcdVersion = map[uint8]string{ SupportedEtcdVersion = map[uint8]string{
8: "3.0.17", 8: "3.0.17",
9: "3.1.10", 9: "3.1.10",
10: "3.1.11", 10: "3.1.10",
} }
) )

2
cmd/kubeadm/app/constants/constants_test.go
View File

@ -137,7 +137,7 @@ func TestEtcdSupportedVersion(t *testing.T) {
}, },
{ {
kubernetesVersion: "1.10.0", kubernetesVersion: "1.10.0",
expectedVersion: version.MustParseSemantic("3.1.11"), expectedVersion: version.MustParseSemantic("3.1.10"),
expectedError: nil, expectedError: nil,
}, },
{ {

2
cmd/kubeadm/app/phases/upgrade/compute_test.go
View File

@ -430,7 +430,7 @@ func TestGetAvailableUpgrades(t *testing.T) {
KubeVersion: "v1.10.0-alpha.2", KubeVersion: "v1.10.0-alpha.2",
KubeadmVersion: "v1.10.0-alpha.2", KubeadmVersion: "v1.10.0-alpha.2",
DNSVersion: "1.14.7", DNSVersion: "1.14.7",
EtcdVersion: "3.1.11", EtcdVersion: "3.1.10",
}, },
}, },
}, },