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 v3.5.3 for Kubernetes 1.22+ #1951

Merged
merged 1 commit into from
Apr 15, 2022
Merged

Use etcd v3.5.3 for Kubernetes 1.22+ #1951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions pkg/templates/kubeadm/v1beta3/kubeadm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,16 @@ func NewConfig(s *state.State, host kubeoneapi.HostConfig) ([]runtime.Object, er
return nil, fail.Config(err, "parsing kubernetes semver")
}

etcdImageTag := cluster.AssetConfiguration.Etcd.ImageTag
etcdExtraArgs := map[string]string{}
if etcdIntegrityCheckConstraint.Check(kubeSemVer) {
// This is required because etcd v3.5 (used for Kubernetes 1.22+)
// This is required because etcd v3.5-[0-2] (used for Kubernetes 1.22+)
// has an issue with the data integrity.
// See https://groups.google.com/a/kubernetes.io/g/dev/c/B7gJs88XtQc/m/rSgNOzV2BwAJ
// for more details.
if etcdImageTag == "" {
etcdImageTag = "3.5.3-0"
}
etcdExtraArgs["experimental-initial-corrupt-check"] = "true"
etcdExtraArgs["experimental-corrupt-check-time"] = "240m"
}
Expand Down Expand Up @@ -168,7 +172,7 @@ func NewConfig(s *state.State, host kubeoneapi.HostConfig) ([]runtime.Object, er
Local: &kubeadmv1beta3.LocalEtcd{
ImageMeta: kubeadmv1beta3.ImageMeta{
ImageRepository: cluster.AssetConfiguration.Etcd.ImageRepository,
ImageTag: cluster.AssetConfiguration.Etcd.ImageTag,
ImageTag: etcdImageTag,
},
ExtraArgs: etcdExtraArgs,
},
Expand Down