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

Upgrade etcd to 3.5.1 #105706

Merged
merged 1 commit into from Nov 15, 2021
Merged

Upgrade etcd to 3.5.1 #105706

merged 1 commit into from Nov 15, 2021

Conversation

uthark
Copy link
Contributor

@uthark uthark commented Oct 15, 2021 •
edited

What type of PR is this?

/kind feature

What this PR does / why we need it:

Upgrade to new etcd to fix issue with v2 storage.
Issue: etcd-io/etcd#13196
PR: etcd-io/etcd#13348

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Upgrade etcd to 3.5.1

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Oct 15, 2021
@k8s-ci-robot
Copy link
Contributor

@uthark: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 15, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @uthark. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubeadm release-note Denotes a PR that will be considered when it comes time to generate release notes. area/provider/gcp Issues or PRs related to gcp provider area/release-eng Issues or PRs related to the Release Engineering subproject area/test sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 15, 2021
@uthark
Copy link
Contributor Author

uthark commented Oct 15, 2021

/assign @dims @SataQiu @sttt

@k8s-ci-robot
Copy link
Contributor

@uthark: GitHub didn't allow me to assign the following users: sttt.

Note that only kubernetes members, repo collaborators and people who have commented on this issue/PR can be assigned. Additionally, issues/PRs can only have 10 assignees at the same time.
For more information please see the contributor guide

In response to this:

/assign @dims @SataQiu @sttt

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

binacs
binacs approved these changes Oct 16, 2021
View reviewed changes
Copy link
Member

@binacs binacs left a comment

Choose a reason for hiding this comment

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

/ok-to-test

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Oct 16, 2021
justaugustus
justaugustus approved these changes Nov 6, 2021
View reviewed changes
Copy link
Member

@justaugustus justaugustus left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
/retest-required

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 6, 2021
@dims
Copy link
Member

dims commented Nov 6, 2021

/lgtm
/approve

@justaugustus
Copy link
Member

/assign @liggitt @sttts

liggitt
liggitt reviewed Nov 8, 2021
View reviewed changes
cluster/images/etcd/migrate/options.go
@@ -28,7 +28,7 @@ import (
)

var (
supportedEtcdVersions = []string{"3.0.17", "3.1.12", "3.2.24", "3.3.17", "3.4.13", "3.5.0"}
supportedEtcdVersions = []string{"3.0.17", "3.1.12", "3.2.24", "3.3.17", "3.4.13", "3.5.1"}
Copy link
Member

Choose a reason for hiding this comment

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

append instead of replace?

Copy link
Member

Choose a reason for hiding this comment

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

+1 for replacing.

In https://github.com/etcd-io/etcd/blob/main/CHANGELOG-3.5.md, the recommended is 3.5.1+.

The minimum recommended etcd versions to run in production are 3.2.28+, 3.3.18+, 3.4.2+, and 3.5.1+.

In https://github.com/kubernetes/kubernetes/pull/105706/files#diff-afb644eceb2c0d53027d3e3815f43f489b31b34d18f5402a626f2fbfd4b6eb52R291, kubeadm mark 3.2.18 as the min external etcd version.

Should we remove "3.0.17", "3.1.12" here as well? Or the bundled/supported versions should maintain the old versions.

Copy link
Member

Choose a reason for hiding this comment

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

The list of old etcd vesions in kubeadm is stale. So cleaning them here or separate PR is fine.

Copy link
Member

Choose a reason for hiding this comment

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

actually, this list isn't related to kubeadm, right? cc @mborsz for feedback on whether append or replace is correct here

Copy link
Member

Choose a reason for hiding this comment

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

doing blame on this line:
https://github.com/kubernetes/kubernetes/blame/e7c3138d94ed4f85073d6d3de543a668c9d60d11/cluster/images/etcd/migrate/options.go#L31

reveals that we always replaced a certain etcd MAJOR.MINOR version with the latest revision or PATCH that we have for the same MINOR.

Copy link
Contributor

Choose a reason for hiding this comment

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

This list is used to decide on which etcd binary to run. Image has multiple binaries to allow handling data on disk from any 3.X version to latest version in image. As Etcd only supports compatibility +/- 1 minor versions we have one version per minor. This means that we should replace "3.5.0" with "3.5.1" as we just need the latest "3.5" binary.

neolit123
neolit123 reviewed Nov 8, 2021
View reviewed changes
Copy link
Member

@neolit123 neolit123 left a comment

Choose a reason for hiding this comment

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

/approve
For kubeadm

@liggitt
Copy link
Member

liggitt commented Nov 8, 2021 •
edited

/assign @mborsz

for the append-or-replace question in cluster/images/etcd/migrate/options.go

lgtm otherwise

@mborsz
Copy link
Member

mborsz commented Nov 8, 2021

/assign @mm4tt
for the append-or-replace question in cluster/images/etcd/migrate/options.go

@neolit123
Copy link
Member

we seem to be bundling the wrong etcd version (3.4.x) in the prior (3.5.0) image:
#106229

i can't seem to figure out if this is a image promotion problem or something that can be fixed in this PR.

@neolit123 neolit123 mentioned this pull request Nov 8, 2021
Closed
@neolit123
Copy link
Member

neolit123 commented Nov 8, 2021 •
edited

we seem to be bundling the wrong etcd version (3.4.x) in the prior (3.5.0) image:
#106229

#102294
^ @serathius @pacoxu

(EDIT: that seems to be a problem for the !amd64 image(s))

@randomvariable randomvariable mentioned this pull request Nov 10, 2021
Closed
@neolit123
Copy link
Member

we seem to be bundling the wrong etcd version (3.4.x) in the prior (3.5.0) image:

this increment seems fine for 1.23 and the 3.5.0 !amd64 image problems are not present in the new 3.5.1 image.
also they were fixed #102294

looks like there is one pending question here:
#105706 (comment)

@serathius
Copy link
Contributor

Hope I clarified the append vs replace discussion. I think we should be able to merge this PR.

@liggitt
Copy link
Member

liggitt commented Nov 15, 2021

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BinacsLee, chirangaalwis, dims, justaugustus, liggitt, neolit123, uthark

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1c127d3 into kubernetes:master Nov 15, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Nov 15, 2021
@ahrtr ahrtr mentioned this pull request Nov 22, 2021
Closed
This was referenced Dec 6, 2021
Merged
Merged
@floryut floryut mentioned this pull request Dec 20, 2021
Merged
@pacoxu pacoxu mentioned this pull request Feb 17, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@neolit123 neolit123 neolit123 left review comments

@liggitt liggitt liggitt left review comments

@pacoxu pacoxu pacoxu left review comments

@serathius serathius serathius left review comments

@justaugustus justaugustus justaugustus approved these changes

@chirangaalwis chirangaalwis chirangaalwis approved these changes

@binacs binacs binacs approved these changes

@alejandrox1 alejandrox1 Awaiting requested review from alejandrox1

@fabriziopandini fabriziopandini Awaiting requested review from fabriziopandini

Assignees

@dims dims

@justaugustus justaugustus

@sttts sttts

@liggitt liggitt

@mborsz mborsz

@mm4tt mm4tt

@SataQiu SataQiu

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/e2e-test-framework Issues or PRs related to refactoring the kubernetes e2e test framework area/kubeadm area/provider/gcp Issues or PRs related to gcp provider area/release-eng Issues or PRs related to the Release Engineering subproject area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet