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 vendoring and common; Allow the AWS backend to get credentials from its environment. #898

Merged
merged 3 commits into from
Aug 16, 2018

Conversation

tomwilkie
Copy link
Contributor

If you give the VMs the right instance profile/role, they can authenticate to DynamoDB without having credentials on the command line.

Signed-off-by: Tom Wilkie [email protected]

@tomwilkie tomwilkie changed the title [WIP] Allow the AWS backend to get credentials from its environment. Allow the AWS backend to get credentials from its environment. Jul 24, 2018
@tomwilkie
Copy link
Contributor Author

Tested, works like a charm.

@tomwilkie
Copy link
Contributor Author

Had to fiddle with dep, and upgrade to 0.5.0, as client_golang, weaveworks/common and uber/jaeger-lib were conflicting.

@tomwilkie
Copy link
Contributor Author

@bboreham PTAL

Gopkg.toml Outdated
@@ -6,6 +6,21 @@
name = "github.com/aws/aws-sdk-go"
version = "v1.10.8"

[[constraint]]
Copy link
Contributor

Choose a reason for hiding this comment

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

Why? I would expect master to be the default in a repo with no releases.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Had to fiddle with dep, and upgrade to 0.5.0, as client_golang, weaveworks/common and uber/jaeger-lib were conflicting.

Copy link
Contributor

Choose a reason for hiding this comment

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

What I need here, in the file, is the reason for the constraint, and the conditions under which it can be removed.

Copy link
Contributor

Choose a reason for hiding this comment

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

I've just tried removing it and everything else stays the same.

@bboreham
Copy link
Contributor

bboreham commented Aug 6, 2018

Please update the PR title and description to include all the material changes.

@bboreham
Copy link
Contributor

bboreham commented Aug 7, 2018

Since I want to update common too, I rebased and tweaked this.

The changes are:

@bboreham
Copy link
Contributor

bboreham commented Aug 7, 2018

Hmm, I thought GitHub would pick up my branch in this PR - master...aws-sts

@bboreham
Copy link
Contributor

@tomwilkie let me know if you'd like me to push the rebase to your branch

Verified

This commit was signed with the committer’s verified signature.
organom Ricardo Gomes
Signed-off-by: Tom Wilkie <[email protected]>
@tomwilkie
Copy link
Contributor Author

Sorry for the delay @bboreham; I didn't realise you wanted the change list from weaveworks/common too!

I've also removed the constraint you identified as superfluous and rebased.

@tomwilkie
Copy link
Contributor Author

tomwilkie commented Aug 16, 2018

I've updated the vendored Prometheus to bring in prometheus/prometheus#4436, better tracing spans in PromQL. This required a bunch of updates to vendored k8s, and some minor modifications.

Verified

This commit was signed with the committer’s verified signature.
organom Ricardo Gomes
Signed-off-by: Tom Wilkie <[email protected]>

Verified

This commit was signed with the committer’s verified signature.
organom Ricardo Gomes
Signed-off-by: Tom Wilkie <[email protected]>
@tomwilkie tomwilkie merged commit 75de09a into cortexproject:master Aug 16, 2018
@tomwilkie tomwilkie deleted the aws-sts branch August 16, 2018 15:41
@bboreham bboreham changed the title Allow the AWS backend to get credentials from its environment. Update vendoring and common; Allow the AWS backend to get credentials from its environment. Sep 5, 2018
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

3 participants