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

This reverts commit 8d6dc2c.
owen-d · May 1, 2020 · e8fece6 · e8fece6
1 parent 8d6dc2c
commit e8fece6
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 81 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.3
+    - image: grafana/loki-build-image:0.9.2
   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.3
+  image: grafana/loki-build-image:0.9.2
   commands:
   - make BUILD_IN_CONTAINER=false test
   depends_on:
   - clone
 
 - name: lint
-  image: grafana/loki-build-image:0.9.3
+  image: grafana/loki-build-image:0.9.2
   commands:
   - make BUILD_IN_CONTAINER=false lint
   depends_on:
   - clone
 
 - name: check-generated-files
-  image: grafana/loki-build-image:0.9.3
+  image: grafana/loki-build-image:0.9.2
   commands:
   - make BUILD_IN_CONTAINER=false check-generated-files
   depends_on:
   - clone
 
 - name: check-mod
-  image: grafana/loki-build-image:0.9.3
+  image: grafana/loki-build-image:0.9.2
   commands:
   - make BUILD_IN_CONTAINER=false check-mod
   depends_on:
@@ -582,7 +582,7 @@ platform:
 
 steps:
 - name: trigger
-  image: grafana/loki-build-image:0.9.3
+  image: grafana/loki-build-image:0.9.2
   commands:
   - ./tools/deploy.sh
   environment:
@@ -610,7 +610,7 @@ platform:
 
 steps:
 - name: trigger
-  image: grafana/loki-build-image:0.9.3
+  image: grafana/loki-build-image:0.9.2
   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.14 or greater and git installed.
+This requires a working Go environment with version 1.13 or greater and git installed.
 
 To add or update a new dependency, use the `go get` command:
 
@@ -67,3 +67,4 @@ import (
 	"github.com/grafana/loki/pkg/logql"
 )
 ```
+
diff --git a/Makefile b/Makefile
@@ -38,7 +38,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.3
+BUILD_IMAGE_VERSION := 0.9.2
 
 # 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.14
+go 1.13
 
 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.14.2 as build
+FROM golang:1.13 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.14.2 as build
+FROM golang:1.13 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.14.2 as build
+FROM golang:1.13 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.14.2 as build
+FROM golang:1.13 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.14.2 as build
+FROM golang:1.13 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/local.md b/docs/installation/local.md
@@ -24,7 +24,7 @@ The community provides packages of Loki for openSUSE Linux. To install:
 
 ### Prerequisites
 
-- Go 1.14 or later
+- Go 1.13 or later
 - Make
 - Docker (for updating protobuf files and yacc files)
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/grafana/loki
 
-go 1.14
+go 1.13
 
 require (
 	github.com/Microsoft/go-winio v0.4.12 // indirect

diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile
@@ -17,10 +17,10 @@ RUN apk add --no-cache docker-cli
 # TODO this should be fixed to download and extract the specific release binary from github as we do for golangci and helm above
 # however we need a commit which hasn't been released yet: https://github.com/drone/drone-cli/commit/1fad337d74ca0ecf420993d9d2d7229a1c99f054
 # Read the comment below regarding GO111MODULE=on and why it is necessary
-FROM golang:1.14.2 as drone
+FROM golang:1.13.4 as drone
 RUN GO111MODULE=on go get github.com/drone/drone-cli/drone@1fad337d74ca0ecf420993d9d2d7229a1c99f054
 
-FROM golang:1.14.2-stretch
+FROM golang:1.13.4-stretch
 RUN apt-get update && \
     apt-get install -qy \
     musl gnupg \