Revert "Revert "Update go from 1.13 to 1.14. (#2013)"" (#2029)

* Revert "Revert "Update go from 1.13 to 1.14. (#2013)"" This reverts commit e8fece6. * Update cortex to latest. Signed-off-by: Cyril Tovena <[email protected]> * Update go.sum and doc. Signed-off-by: Cyril Tovena <[email protected]> Co-authored-by: Cyril Tovena <[email protected]>
grafana · Jun 26, 2020 · 7682b32 · 7682b32
1 parent 17390fd
commit 7682b32
Show file tree

Hide file tree

Showing 156 changed files with 11,338 additions and 1,432 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -47,7 +47,7 @@ workflows:
 # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/
 .defaults: &defaults
   docker:
-    - image: grafana/loki-build-image:0.9.2
+    - image: grafana/loki-build-image:0.9.3
   working_directory: /src/loki
 
 jobs:

diff --git a/.drone/drone.yml b/.drone/drone.yml
@@ -12,28 +12,28 @@ workspace:
 
 steps:
 - name: test
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - make BUILD_IN_CONTAINER=false test
   depends_on:
   - clone
 
 - name: lint
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - make BUILD_IN_CONTAINER=false lint
   depends_on:
   - clone
 
 - name: check-generated-files
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
 
 - name: check-mod
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - make BUILD_IN_CONTAINER=false check-mod
   depends_on:
@@ -638,7 +638,7 @@ platform:
 
 steps:
 - name: trigger
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - ./tools/deploy.sh
   environment:
@@ -666,7 +666,7 @@ platform:
 
 steps:
 - name: trigger
-  image: grafana/loki-build-image:0.9.2
+  image: grafana/loki-build-image:0.9.3
   commands:
   - go run ./tools/delete_tags.go -max-age=2160h -repo grafana/loki -delete
   - go run ./tools/delete_tags.go -max-age=2160h -repo grafana/promtail -delete

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -26,7 +26,7 @@ Please follow the [Loki Helm Chart](./production/helm/README.md).
 ### Dependency management
 
 We use [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages.
-This requires a working Go environment with version 1.13 or greater and git installed.
+This requires a working Go environment with version 1.14 or greater and git installed.
 
 To add or update a new dependency, use the `go get` command:
 
@@ -67,4 +67,3 @@ import (
 	"github.com/grafana/loki/pkg/logql"
 )
 ```
-
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ IMAGE_NAMES := $(foreach dir,$(DOCKER_IMAGE_DIRS),$(patsubst %,$(IMAGE_PREFIX)%,
 # make BUILD_IN_CONTAINER=false target
 # or you can override this with an environment variable
 BUILD_IN_CONTAINER ?= true
-BUILD_IMAGE_VERSION := 0.9.2
+BUILD_IMAGE_VERSION := 0.9.3
 
 # Docker image info
 IMAGE_PREFIX ?= grafana

diff --git a/cmd/chunks-inspect/go.mod b/cmd/chunks-inspect/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/loki/cmd/chunks-inspect
 
-go 1.13
+go 1.14
 
 require (
 	github.com/frankban/quicktest v1.7.2 // indirect

diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13 as build
+FROM golang:1.14.2 as build
 COPY . /src/loki
 WORKDIR /src/loki
 RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin

diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13 as build
+FROM golang:1.14.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13 as build
+FROM golang:1.14.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13 as build
+FROM golang:1.14.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/cmd/promtail/Dockerfile.arm32 b/cmd/promtail/Dockerfile.arm32
@@ -1,4 +1,4 @@
-FROM golang:1.13 as build
+FROM golang:1.14.2 as build
 # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them.
 # This is helpful when file system timestamps can't be trusted with make
 ARG TOUCH_PROTOS

diff --git a/docs/installation/install-from-source.md b/docs/installation/install-from-source.md
@@ -4,7 +4,7 @@ In order to build Loki manually, you need to clone the GitHub repo and then `mak
 
 ## Prerequisites
 
-- Go 1.13 or later
+- Go 1.14 or later
 - Make
 - Docker (for updating protobuf files and yacc files)
 

diff --git a/docs/installation/local.md b/docs/installation/local.md
@@ -1,12 +1,12 @@
 # Install and run Loki locally
 
-In order to log events with Loki, you must download and install both Promtail and Loki. 
+In order to log events with Loki, you must download and install both Promtail and Loki.
 - Loki is the logging engine.
 - Promtail sends logs to Loki.
 
 ## Install and run
 
-1. Navigate to the [release page](https://github.com/grafana/loki/releases/). 
+1. Navigate to the [release page](https://github.com/grafana/loki/releases/).
 2. Scroll down to the Assets section under the version that you want to install.
 3. Download the Loki and Promtail .zip files that correspond to your system.
    **Note:** Do not download LogCLI or Loki Canary at this time. [LogCLI](./getting-started/logcli.md) allows you to run Loki queries in a command line interface. [Loki Canary](./operations/loki-canary.md) is a tool to audit Loki performance.

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/loki
 
-go 1.13
+go 1.14
 
 require (
 	github.com/Microsoft/go-winio v0.4.12 // indirect
@@ -10,7 +10,7 @@ require (
 	github.com/containerd/containerd v1.3.2 // indirect
 	github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
-	github.com/cortexproject/cortex v1.1.1-0.20200616130854-34b45d1180c3
+	github.com/cortexproject/cortex v1.1.1-0.20200625134921-0ea2318b0174
 	github.com/davecgh/go-spew v1.1.1
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.7.3-0.20190817195342-4760db040282
@@ -46,15 +46,15 @@ require (
 	github.com/prometheus/client_golang v1.6.1-0.20200604110148-03575cad4e55
 	github.com/prometheus/client_model v0.2.0
 	github.com/prometheus/common v0.10.0
-	github.com/prometheus/prometheus v1.8.2-0.20200609052543-1627d234da06
+	github.com/prometheus/prometheus v1.8.2-0.20200622142935-153f859b7499
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 	github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
 	github.com/stretchr/testify v1.5.1
 	github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448
 	github.com/uber/jaeger-client-go v2.23.1+incompatible
 	github.com/ugorji/go v1.1.7 // indirect
 	github.com/weaveworks/common v0.0.0-20200512154658-384f10054ec5
-	go.etcd.io/bbolt v1.3.4
+	go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50
 	golang.org/x/net v0.0.0-20200602114024-627f9648deb9
 	google.golang.org/grpc v1.29.1
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6