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

[AD] auth support for etcd provider #278

Merged
merged 3 commits into from
Jun 6, 2017
Merged

[AD] auth support for etcd provider #278

merged 3 commits into from
Jun 6, 2017

Conversation

xvello
Copy link
Contributor

@xvello xvello commented Jun 6, 2017

What does this PR do?

Mirroring DataDog/dd-agent#3357 , add sd_backend_username & sd_backend_password options to enable authentication when connecting to the etcd datastore.

Additional Notes

Etcd integration test runs with go test github.com/DataDog/datadog-agent/test/integration/config_providers/etcd_provider_test.go but is not yet enabled in CI.

@xvello xvello changed the title auth support for etcd provider [AD} auth support for etcd provider Jun 6, 2017
@xvello xvello changed the title [AD} auth support for etcd provider [AD] auth support for etcd provider Jun 6, 2017
@masci
Copy link
Contributor

masci commented Jun 6, 2017

LGTM but are the changes to test/integration/docker/dsd_alpine_listening.sh related?

@xvello
Copy link
Contributor Author

xvello commented Jun 6, 2017

No, but got red tests on this PR because the test got flaky. Should I cherry pick this commit in another PR?

Copy link
Contributor

@masci masci left a comment

Choose a reason for hiding this comment

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

Let's keep the CI fix in this PR! 👍

@xvello xvello merged commit 8087647 into master Jun 6, 2017
@xvello xvello deleted the xvello/etcd_auth branch June 6, 2017 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants