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.

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

Update etcd version to 3.1.11 for release 1.9 #57811

Merged
merged 2 commits into from
Jan 11, 2018

Conversation

xiangpengzhao
Copy link
Contributor

@xiangpengzhao xiangpengzhao commented Jan 4, 2018

What this PR does / why we need it:

This is fixing some bugs in HA setups.

ref: #57238
#57633 (review) and discussions in that thread.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
ref: #57238

Special notes for your reviewer:
/cc @wojtek-t @luxas @jpbetz @mbohlool

Release note:

Update etcd version to 3.1.11

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 4, 2018
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 4, 2018
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. 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. labels Jan 4, 2018
@xiangpengzhao
Copy link
Contributor Author

bazel failed due to

ERROR: /workspace/k8s.io/kubernetes/test/integration/framework/BUILD:8:1: no such package '@com_coreos_etcd//': Error downloading [https://github.com/coreos/etcd/releases/download/v3.1.11/etcd-v3.1.11-linux-amd64.tar.gz] to /root/.cache/bazel/_bazel_root/e9f728bbd90b3fba632eb31b20e1dacd/external/com_coreos_etcd/etcd-v3.1.11-linux-amd64.tar.gz: Checksum was b80c6c0719beee703821ece80f9e48b071ad5f59bb284bd3ea2104700738d9ec but wanted 2d335f298619c6fb02b1124773a56966e448ad9952b26fea52909da4fe80d2be and referenced by '//test/integration/framework:go_default_library'

@jpbetz any ideas?

@@ -442,47 +437,47 @@
},
{
"ImportPath": "github.com/containerd/containerd/api/services/containers/v1",
"Comment": "v1.0.0-beta.2-159-g27d450a0",
"Comment": "v1.0.0-beta.2-159-g27d450a",
Copy link
Member

Choose a reason for hiding this comment

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

Why are we bumping all of these too? Are those really transitive dependencies of etcd client?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just followed the guide Using godep to manage dependencies and it updated godeps for me. I'm not sure why this was updated. But maybe it's a mistake: g27d450a0 vs g27d450a. I will revert it manually.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Took another look and found that this is just a Comment change. I guess it's a upstream Comment change. Here it doesn't bump the real code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

See also: #57811 (comment)

@wojtek-t
Copy link
Member

wojtek-t commented Jan 4, 2018

@xiangpengzhao - thanks a lot for putting this together.
Did you have a chance to look into test failures? Those doesn't seem like flakes to me

@xiangpengzhao
Copy link
Contributor Author

xiangpengzhao commented Jan 5, 2018

Did you have a chance to look into test failures? Those doesn't seem like flakes to me

The log shows the checksum of etcd-v3.1.11-linux-amd64.tar.gz is incorrect. @jpbetz do you know what may cause this failure? Thanks!

ERROR: /workspace/k8s.io/kubernetes/test/integration/framework/BUILD:8:1: no such package 
'@com_coreos_etcd//': Error downloading 
[https://github.com/coreos/etcd/releases/download/v3.1.11/etcd-v3.1.11-linux-amd64.tar.gz] to 
/root/.cache/bazel/_bazel_root/e9f728bbd90b3fba632eb31b20e1dacd/external/com_coreos_etcd/etcd-
v3.1.11-linux-amd64.tar.gz: Checksum was 
b80c6c0719beee703821ece80f9e48b071ad5f59bb284bd3ea2104700738d9ec but wanted 
2d335f298619c6fb02b1124773a56966e448ad9952b26fea52909da4fe80d2be and referenced by 
'//test/integration/framework:go_default_library'

UPDATE: find the clue here #49393 (comment). Thanks @mikedanese ! :)

"Rev": "edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c"
},
{
"ImportPath": "github.com/docker/docker/api",
"Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616fb1",
"Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

we can seee the Godeps.json file in openshift. Its Comment is also docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f.
https://github.com/openshift/origin/blob/master/Godeps/Godeps.json#L1219

		{
			"ImportPath": "github.com/docker/docker/api",
			"Comment": "docs-v1.12.0-rc4-2016-07-15-7401-g4f3616f",
			"Rev": "4f3616fb1c112e206b88cb7a9922bf49067a7756"
		},

@xiangpengzhao
Copy link
Contributor Author

@wojtek-t @mbohlool all tests passed, PTAL. Thanks!

@wojtek-t
Copy link
Member

wojtek-t commented Jan 5, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 5, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: wojtek-t, xiangpengzhao

Associated issue: #57238

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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 Jan 5, 2018
@xiangpengzhao
Copy link
Contributor Author

@wojtek-t thanks!
ping @mbohlool for cherry-picking approval. Sorry for missing the 1.9.1 train...

@mbohlool
Copy link
Contributor

mbohlool commented Jan 8, 2018

Why didn't you use automatic tools to cherrypick #57238?

@wojtek-t
Copy link
Member

wojtek-t commented Jan 8, 2018

@mbohlool - this is a different PR; that was just for build an image. This is bumping dependencies and using that image.
There wasn't corresponding PR in master branch, since we bumped etcd there directly to 3.2.12.

@mbohlool mbohlool added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jan 10, 2018
@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@xiangpengzhao
Copy link
Contributor Author

/test pull-kubernetes-unit

@k8s-github-robot
Copy link

/test all

Tests are more than 96 hours old. Re-running tests.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to @fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-github-robot
Copy link

/test all

Tests are more than 96 hours old. Re-running tests.

@xiangpengzhao
Copy link
Contributor Author

/retest

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

/test all

Tests are more than 96 hours old. Re-running tests.

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 396b9d0 into kubernetes:release-1.9 Jan 11, 2018
@xiangpengzhao xiangpengzhao deleted the branch1.9 branch January 11, 2018 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants