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

Use etcd image version suffixes in kubeadm #82348

Merged
merged 2 commits into from Sep 5, 2019
Merged

Use etcd image version suffixes in kubeadm #82348

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a3399f
Add etcd image version to kubeadm
jpbetz Sep 4, 2019
4c2b073
Simplify etcd image version usage in kubeadm
jpbetz Sep 4, 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
6 changes: 3 additions & 3 deletions cmd/kubeadm/app/constants/constants.go
View file
Open in desktop
Expand Up @@ -260,7 +260,7 @@ const (
MinExternalEtcdVersion = "3.2.18"

// DefaultEtcdVersion indicates the default etcd version that kubeadm uses
DefaultEtcdVersion = "3.3.15"
DefaultEtcdVersion = "3.3.15-0"

// PauseVersion indicates the default pause image version for kubeadm
PauseVersion = "3.1"
Expand Down Expand Up @@ -424,8 +424,8 @@ var (
13: "3.2.24",
14: "3.3.10",
15: "3.3.10",
16: "3.3.15",
17: "3.3.15",
16: "3.3.15-0",
17: "3.3.15-0",
Copy link
Member

@neolit123 neolit123 Sep 4, 2019 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we could have done that for both 16 and 17 in @dims PR.
but let's wait for it to merge and we can amend here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, I noticed the same thing while writing this PR up. I'll simplify this PR and we can use it to amend.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll hold it on until #82199 lands in.
/hold

}

// KubeadmCertsClusterRoleName sets the name for the ClusterRole that allows
Expand Down