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

Add support for etcd #61

Merged
merged 17 commits into from
Jan 5, 2016
Merged

Conversation

justenwalker
Copy link
Contributor

Adds etcd as an alternate discovery backend

Changes

  • Add dependency on github.com/coreos/etcd/client
  • Implement DiscoveryService for etcd
  • Create etcd example images
  • Clean up makefile and examples to support multiple backend examples
  • Support running both examples from the makefile
    • make run-consul to run the consul example
    • make run-etcd to run the etcd example
    • make clean-consul to stop and clean up the consul example
    • make clean-etcd to stop and clean up the etcd example

For #11

🎊 Happy New Year 🎊

}

func (c Etcd) deregisterService(service *ServiceConfig) error {
_, err := c.API.Delete(context.Background(), c.getNodeKey(service), &client.DeleteOptions{Dir: true, Recursive: true})
Copy link
Contributor

Choose a reason for hiding this comment

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

can you break this long line?

@tgross
Copy link
Contributor

tgross commented Jan 4, 2016

@justenwalker we've got a merge conflict here now that #59 has been merged.

@justenwalker
Copy link
Contributor Author

@tgross rebased

- 4001:4001
restart: always

nginx:
Copy link
Contributor

Choose a reason for hiding this comment

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

The ports/expose spec for this should be:

ports:
- 80

without an expose stanza.

@justenwalker
Copy link
Contributor Author

@tgross rebased

@tgross
Copy link
Contributor

tgross commented Jan 5, 2016

Awesome. Let's ship it!

tgross added a commit that referenced this pull request Jan 5, 2016
@tgross tgross merged commit 64eba9d into TritonDataCenter:master Jan 5, 2016
@justenwalker justenwalker deleted the etcd_backend branch January 5, 2016 14:56
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.

None yet

2 participants