Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kubeadm: add 1.18 entry in the etcd map #83314

Merged
merged 2 commits into from
Oct 4, 2019
Merged

kubeadm: add 1.18 entry in the etcd map #83314

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c42fe7
1.18 entry in etcd map
fabriziopandini Oct 1, 2019
2ab2fc8
make test pass
fabriziopandini Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,12 +420,12 @@ var (

// SupportedEtcdVersion lists officially supported etcd versions with corresponding Kubernetes releases
SupportedEtcdVersion = map[uint8]string{
12: "3.2.24",
13: "3.2.24",
14: "3.3.10",
15: "3.3.10",
16: "3.3.15-0",
17: "3.3.15-0",
18: "3.3.15-0",
fabriziopandini marked this conversation as resolved.
Show resolved Hide resolved
}

// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows
Expand Down
10 changes: 5 additions & 5 deletions cmd/kubeadm/app/images/images_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,17 +103,17 @@ func TestGetEtcdImage(t *testing.T) {
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: "1.12.0",
KubernetesVersion: "1.16.0",
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{},
},
},
expected: "real.repo/etcd:3.2.24",
expected: "real.repo/etcd:3.3.15-0",
},
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: "1.12.0",
KubernetesVersion: "1.16.0",
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{
Expand All @@ -127,7 +127,7 @@ func TestGetEtcdImage(t *testing.T) {
{
cfg: &kubeadmapi.ClusterConfiguration{
ImageRepository: "real.repo",
KubernetesVersion: "1.12.0",
KubernetesVersion: "1.16.0",
Etcd: kubeadmapi.Etcd{
Local: &kubeadmapi.LocalEtcd{
ImageMeta: kubeadmapi.ImageMeta{
Expand All @@ -136,7 +136,7 @@ func TestGetEtcdImage(t *testing.T) {
},
},
},
expected: "override/etcd:3.2.24",
expected: "override/etcd:3.3.15-0",
},
{
expected: GetGenericImage(gcrPrefix, "etcd", constants.DefaultEtcdVersion),
Expand Down