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

Remove old etcd client dependency #11610

Merged
merged 3 commits into from
Nov 7, 2016

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Oct 27, 2016

Also updates master_config to use new etcd client.

Fixes: #11573

func GetAndTestEtcdClient(etcdClientInfo configapi.EtcdConnectionInfo) (*etcdclient.Client, error) {
etcdClient, err := EtcdClient(etcdClientInfo)
func GetAndTestEtcdClient(etcdClientInfo configapi.EtcdConnectionInfo) (newetcdclient.Client, error) {
etcdClient, err := MakeNewEtcdClient(etcdClientInfo)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@smarterclayton does this change seems correct to you?

Copy link
Contributor

Choose a reason for hiding this comment

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

Rename newetcdclient to just etcdclient.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

renamed.

@mfojtik
Copy link
Contributor Author

mfojtik commented Oct 27, 2016

@smarterclayton @timothysc PTAL

@mfojtik
Copy link
Contributor Author

mfojtik commented Oct 27, 2016

[test]

@soltysh
Copy link
Contributor

soltysh commented Oct 27, 2016

The vendor commit change needs to be renamed to UPSTREAM: : or UPSTREAM: coreos/go-etcd: drop.

Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

One question, but overall this LGTM

@@ -23,48 +20,17 @@ import (
// connect to the etcd server and block until the server responds at least once, or return an
// error if the server never responded.
// TODO: switch this function to use EtcdHelper.
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this TODO still valid?

Choose a reason for hiding this comment

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

don't think so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed.

@timothysc
Copy link

for part 1 removal of old, lgtm.

You'll need to abstract the client itself on another iteration, b/c that's the v2 client.

@mfojtik
Copy link
Contributor Author

mfojtik commented Oct 31, 2016

@timothysc @smarterclayton @soltysh updated, PTAL.

@soltysh
Copy link
Contributor

soltysh commented Oct 31, 2016

Still LGTM, but you need to update your commit message to match one of these.

@mfojtik mfojtik force-pushed the remove-old-etcd branch 4 times, most recently from a294838 to 7f8b478 Compare October 31, 2016 12:26
@timothysc
Copy link

lgtm

@smarterclayton
Copy link
Contributor

You missed a spot :)

On Mon, Oct 31, 2016 at 10:37 AM, OpenShift Bot notifications@github.com
wrote:

continuous-integration/openshift-jenkins/test FAILURE (
https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/10842/) (Base
Commit: 8b2d509
8b2d509
)


You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
#11610 (comment),
or mute the thread
https://github.com/notifications/unsubscribe-auth/ABG_p57ydiEodKjcfKWgLLnvksqKLNGqks5q5f0tgaJpZM4KiMhG
.

@mfojtik
Copy link
Contributor Author

mfojtik commented Oct 31, 2016

@smarterclayton hrm I had to rewrite the etcd dumper :-) please take a look if I did it right...

@smarterclayton
Copy link
Contributor

Looks fine.

@soltysh
Copy link
Contributor

soltysh commented Nov 1, 2016

It looks like you forgot to update tests, both integration and extended with your changes.

@mfojtik
Copy link
Contributor Author

mfojtik commented Nov 2, 2016

@soltysh I don't, this is go 1.7 (on my dev) vs. go 1.6 (in CI) :-)

@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

@soltysh I don't, this is go 1.7 (on my dev) vs. go 1.6 (in CI) :-)

Oh yeah, that happens...

@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

This was hopefully last hit of #11661.

re-[test]

@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

Flake #11649.

@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

re-[test]

@soltysh
Copy link
Contributor

soltysh commented Nov 2, 2016

Flakes: #11682, #10773 and #11016

re-[test]

@soltysh
Copy link
Contributor

soltysh commented Nov 3, 2016

Flake #11682 #11016

re-[test]

@mfojtik
Copy link
Contributor Author

mfojtik commented Nov 7, 2016

flake: #11799

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 68020fd

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11186/) (Base Commit: b81b382)

@mfojtik
Copy link
Contributor Author

mfojtik commented Nov 7, 2016

tests are green, shipping!

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Nov 7, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/11186/) (Base Commit: b81b382) (Image: devenv-rhel7_5326)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 68020fd

@openshift-bot openshift-bot merged commit 058a0d8 into openshift:master Nov 7, 2016
@mfojtik mfojtik deleted the remove-old-etcd branch September 5, 2018 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants