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.

Sign up for GitHub

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

Jump to bottom

Pull in cortex changes to support IAM roles for EKS #1340

Merged
merged 3 commits into from
Nov 30, 2019
Merged

Pull in cortex changes to support IAM roles for EKS #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a988231
pull in cortex changes to support IAM roles for EKS
adamjohnson01 Nov 29, 2019
ef6b56b
Merge branch 'master' of https://github.com/grafana/loki into iam_rol…
adamjohnson01 Nov 29, 2019
f4286a1
update go.sum after running tidy
adamjohnson01 Nov 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/bmatcuk/doublestar v1.1.1
github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
github.com/cortexproject/cortex v0.3.1-0.20191117214907-06c4340e652d
github.com/cortexproject/cortex v0.3.1-0.20191122194007-ed7c302fd968
github.com/davecgh/go-spew v1.1.1
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v0.0.0-20190607191414-238f8eaa31aa
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg=
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
github.com/cortexproject/cortex v0.3.1-0.20191117214907-06c4340e652d h1:b0rUibdDf+OVEdBvfUIptXR0Sqn3DUz3C0Ilm8d/yOg=
github.com/cortexproject/cortex v0.3.1-0.20191117214907-06c4340e652d/go.mod h1:kxKBAZMqeLb5cr4YTxVFoquewYNStgqAfLvx9Y/Y08k=
github.com/cortexproject/cortex v0.3.1-0.20191122194007-ed7c302fd968 h1:cI97HPV3BMKCHmLNYAyIzbuFW3T7EOdDckvizPTGYtQ=
github.com/cortexproject/cortex v0.3.1-0.20191122194007-ed7c302fd968/go.mod h1:kxKBAZMqeLb5cr4YTxVFoquewYNStgqAfLvx9Y/Y08k=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/cznic/b v0.0.0-20180115125044-35e9bbe41f07/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
github.com/cznic/fileutil v0.0.0-20180108211300-6a051e75936f/go.mod h1:8S58EK26zhXSxzv7NQFpnliaOQsmDUxvoQO3rt154Vg=
Expand Down
2 changes: 1 addition & 1 deletion vendor/github.com/cortexproject/cortex/pkg/chunk/aws/dynamodb_storage_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion vendor/github.com/cortexproject/cortex/pkg/chunk/aws/s3_storage_client.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ github.com/coreos/go-systemd/sdjournal
# github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f
github.com/coreos/pkg/capnslog
github.com/coreos/pkg/dlopen
# github.com/cortexproject/cortex v0.3.1-0.20191117214907-06c4340e652d
# github.com/cortexproject/cortex v0.3.1-0.20191122194007-ed7c302fd968
github.com/cortexproject/cortex/pkg/chunk
github.com/cortexproject/cortex/pkg/chunk/aws
github.com/cortexproject/cortex/pkg/chunk/cache
Expand Down