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

dep => go mod #1062

Merged
merged 47 commits into from
Sep 30, 2019
Merged

dep => go mod #1062

merged 47 commits into from
Sep 30, 2019

Conversation

joe-elliott
Copy link
Member

@joe-elliott joe-elliott commented Sep 25, 2019 •
edited
Loading

What this PR does / why we need it:
Changes Loki package management from dep to go modules.

Special notes for your reviewer:
This is a parallel effort to #571.

  • Removed dep files and added go module files dependency files
  • Built loki-build-image 0.6.0 to migrate to 1.12
  • Updated all build images to use /src/loki to force usage of go modules
  • Added details to contributing.md
  • Minor codebase changes to handle dependency changes
  • Makefile has been updated to force using vendored dependencies

@sh0rez sh0rez mentioned this pull request Sep 26, 2019
Merged
@cyriltovena cyriltovena mentioned this pull request Sep 26, 2019
Closed
2 tasks
@daixiang0
Copy link
Contributor

cool

@joe-elliott
go mod files added. dep removed
074687e 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Magically got prometheus version to stick
8dea03a 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Cortex updated and prometheus updated
3b7ba8c 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated prometheus dependency
c32e928 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added additional deps
75fc14f 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added two replaces from Gopkg.toml. Tests passing
998d043 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added deps
7ba77d6 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated build image to 1.12
8848b5d 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated golangci-lint to use vendored dependencies
3eba7b1 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added check-mod makefile step and referenced in drone and circle ci c…
61a62d6 
…onfigs

Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated loki-build-image to 1.12
bf5d762 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Fixed linting error. Force go111module on for linting
6d33540 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
go mod vendor
4427bf6 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Forced the inclusion of modtimevfs
3fba173 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Pin client-go due to issue with v12 go.mod
0aaaac4 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
go mod tidy
047058d 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added check-mod to drone
d94c324 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Re-readded correct golang client
ea9a27f 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
go mod tidy
c8a74af 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Pinned golang/x/net to avoid proxy errors
c1e022a 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Removed check-mod from all. Not necessary for tests
bc2e826 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated go.sum to match new pin
f58a567 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Upgraded proto to match build image
a7abe3a 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Force check-mod to wait til after test and lint are successful
c267897 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added mod vendor to go builds to force usage of vendored dependencies
0b02ac3 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Turn on gomodules on all builds
6e5cc9e 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Revert "Added mod vendor to go builds to force usage of vendored depe…
f63eb45 
…ndencies"

This reverts commit 65865a24c9a23133e0fa52942f2828ead7c22147.
@joe-elliott
Explicitly choose build image for docker driver
b227f44 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated golang.org/x/sys to match prometheus's version to fix promtai…
b42c61c 
…l windows compilation

Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added fluentbit dependency
53663e6 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added dependency management clause
a535c30 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Updated go version in contributing
942939e 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added phony makefile targets
6096862 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Circle CI is increasingly failing linting
5a9d2b0 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Force vendored deps on builds
414e075 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added logcli to gitignore
44ddd0c 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Reduced concurrency to help CircleCI
4ec1755 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Moved drone builds out of GOPATH to force use of go module
63acf85 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added mod vendor to prevent go clean from redownloading all packages
07143c5 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added to test as well
0d97e84 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Added mod-vendor to final go commands
c7a800c 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Moved fluent-bit out of GO_PATH to force go modules
70c45d8 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
Pass mod vendor to the last holdout: go generate
3490373 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott joe-elliott marked this pull request as ready for review September 27, 2019 18:50
@joe-elliott
Updated ugorji/go to 1.17 to avoid version regression
70a5e03 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@joe-elliott
go mod tidy and go mod vendor for ugorji/go
ed2db69 
Signed-off-by: Joe Elliott <number101010@gmail.com>
@cyriltovena cyriltovena mentioned this pull request Sep 30, 2019
Closed
cyriltovena
cyriltovena approved these changes Sep 30, 2019
View reviewed changes
Copy link
Contributor

@cyriltovena cyriltovena left a comment

Choose a reason for hiding this comment

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

LGTM

@cyriltovena cyriltovena merged commit fc6c5c0 into grafana:master Sep 30, 2019
@cyriltovena cyriltovena mentioned this pull request Sep 30, 2019
Closed
@sh0rez
Copy link
Member

sh0rez commented Sep 30, 2019

Wow! This is super awesome! Thanks y‘all! 🎉 🍿

@clickyotomy clickyotomy mentioned this pull request Oct 1, 2019
Closed
cyriltovena pushed a commit to cyriltovena/loki that referenced this pull request Jun 11, 2021
@bboreham
Remove deprecated global tags setting (grafana#1062)
a6b3f72 
This was added in July 2017 as a backwards-compatibility measure;
removing now nobody uses it.

Signed-off-by: Bryan Boreham <bryan@weave.works>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cyriltovena cyriltovena cyriltovena approved these changes

@rfratto rfratto Awaiting requested review from rfratto

@slim-bean slim-bean Awaiting requested review from slim-bean

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@joe-elliott @daixiang0 @sh0rez @cyriltovena