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 to etcd 3.0.10 #33393

Merged
merged 1 commit into from
Sep 27, 2016
Merged

Conversation

timothysc
Copy link
Member

@timothysc timothysc commented Sep 23, 2016

Problem Statement:
Update repository to use etcd 3.0.10 client libraries, fixes watch issue(s).

/cc @luxas @hongchaodeng @lavalamp @smarterclayton @wojtek-t @ingvagabund

etcd3: update to etcd 3.0.10

xref: #32404


This change is Reviewable

@timothysc timothysc added sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. area/etcd do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Sep 23, 2016
@timothysc timothysc added this to the v1.5 milestone Sep 23, 2016
@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Sep 23, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins Kubemark GCE e2e failed for commit 99bfc1d. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit 99bfc1d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 99bfc1d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@@ -72,7 +72,7 @@ RUN mkdir $TMPDIR \
github.com/jteeuwen/go-bindata/go-bindata

# Download and symlink etcd. We need this for our integration tests.
RUN export ETCD_VERSION=v2.2.1; \
RUN export ETCD_VERSION=v3.0.10; \
Copy link
Member

Choose a reason for hiding this comment

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

I think we don't want to change build images and default configs yet.

Can you please just bump godeps in this PR?

@lavalamp - thoughts?

Copy link
Member Author

Choose a reason for hiding this comment

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

Well we want to do it early in the cycle, I just need to know when...?

Copy link
Member

Choose a reason for hiding this comment

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

You mean for testing purposes? If so, updating this is not necessary, see e.g.:
https://github.com/kubernetes/test-infra/blob/master/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e-gce.yaml#L304

where we already have etcd3 enabled (some older version, but still).

Copy link
Member Author

@timothysc timothysc Sep 26, 2016

Choose a reason for hiding this comment

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

@wojtek-t there have been some pretty nasty bug fixes since 3.0.4 which is why I'm tracking the fix: https://github.com/coreos/etcd/releases/

Up to you though, I can back-out that commit and just focus on the client fixes.

Copy link
Member

Choose a reason for hiding this comment

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

Sure - we can build a newer image for that (and we should do that).

All I'm saying is that we can test non-default images without actually changing tags in the codebase.

Copy link
Member Author

Choose a reason for hiding this comment

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

@wojtek-t ok, updated pr to only godep update.

@timothysc timothysc added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Sep 26, 2016
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 26, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCI Kubemark GCE e2e failed for commit a8dbab6. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark gci e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@luxas
Copy link
Member

luxas commented Sep 26, 2016

@wojtek-t I assume we will use 3.1.x finally in the v1.5 release, right?

@timothysc
Copy link
Member Author

@luxas most likely yes.

@luxas
Copy link
Member

luxas commented Sep 26, 2016

Great! Thanks

@timothysc
Copy link
Member Author

@wojtek-t PTAL.

@wojtek-t
Copy link
Member

lgtm

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 27, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 417fc0b into kubernetes:master Sep 27, 2016
hongchaodeng added a commit to hongchaodeng/kubernetes that referenced this pull request Sep 27, 2016
Since kubernetes#33393 is merged, the bug should have been fixed.
k8s-github-robot pushed a commit that referenced this pull request Sep 28, 2016
Automatic merge from submit-queue

Revert "Work around the etcd watch issue"

Reverts #33101

Since #33393 is merged, the bug should have been fixed.
k8s-github-robot pushed a commit that referenced this pull request Sep 29, 2016
Automatic merge from submit-queue

revert #32012 (Unshare cluster in each test suite)

revert #32012

Since #33393 is merged, the bug should have been fixed.
@wojtek-t wojtek-t modified the milestones: v1.4, v1.5 Oct 19, 2016
wojtek-t pushed a commit to wojtek-t/kubernetes that referenced this pull request Oct 19, 2016
Since kubernetes#33393 is merged, the bug should have been fixed.
wojtek-t pushed a commit to wojtek-t/kubernetes that referenced this pull request Oct 20, 2016
Since kubernetes#33393 is merged, the bug should have been fixed.
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 20, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 21, 2016
#31704-#32831-#32907-#33003-#33349-#31190-#33581-#34089-#34234-#32822-#33393-#34246-#34435-#32477-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477 upstream release 1.4

We are going to release etcd v3 in 1.4.x release.

```
Cherrypick etcd v3-related bug fixes to 1.4 branch
```

Those PRs include:
- Updates of etcd Godeps
- Update to pkg/storage/etcd directory
- Two PR that were unnecessary to avoid conflicts: #31189 #31704

Automated cherry pick of #31189 #31704 #32831 #32907 #33003 #33349 #31190 #33581 #34089 #34234 #32822 #33393 #34246 #34435 #32477

@hongchaodeng @xiang90 @lavalamp @smarterclayton
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Since kubernetes#33393 is merged, the bug should have been fixed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/etcd cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants