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

This reverts commit 8d6dc2c4ca.
pull/2030/head
Owen Diehl 6 years ago committed by GitHub
parent 8d6dc2c4ca
commit 2d31d07680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .circleci/config.yml
  2. 12
      .drone/drone.yml
  3. 3
      CONTRIBUTING.md
  4. 2
      Makefile
  5. 2
      cmd/chunks-inspect/go.mod
  6. 2
      cmd/fluent-bit/Dockerfile
  7. 2
      cmd/loki-canary/Dockerfile
  8. 2
      cmd/loki/Dockerfile
  9. 2
      cmd/promtail/Dockerfile
  10. 2
      cmd/promtail/Dockerfile.arm32
  11. 2
      docs/installation/local.md
  12. 2
      go.mod
  13. 4
      loki-build-image/Dockerfile
  14. 62
      vendor/modules.txt

@ -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:

@ -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

@ -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"
)
```

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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)

@ -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

@ -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 \

62
vendor/modules.txt vendored

@ -45,7 +45,6 @@ github.com/BurntSushi/toml
# github.com/Masterminds/squirrel v0.0.0-20161115235646-20f192218cf5
github.com/Masterminds/squirrel
# github.com/Microsoft/go-winio v0.4.12
## explicit
github.com/Microsoft/go-winio
# github.com/NYTimes/gziphandler v1.1.1
github.com/NYTimes/gziphandler
@ -113,15 +112,12 @@ github.com/aws/aws-sdk-go/service/sts/stsiface
# github.com/beorn7/perks v1.0.1
github.com/beorn7/perks/quantile
# github.com/blang/semver v3.5.1+incompatible
## explicit
github.com/blang/semver
# github.com/bmatcuk/doublestar v1.2.2
## explicit
github.com/bmatcuk/doublestar
# github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b
github.com/bradfitz/gomemcache/memcache
# github.com/c2h5oh/datasize v0.0.0-20200112174442-28bbd4740fee
## explicit
github.com/c2h5oh/datasize
# github.com/cenkalti/backoff v1.0.0
github.com/cenkalti/backoff
@ -130,15 +126,12 @@ github.com/cespare/xxhash
# github.com/cespare/xxhash/v2 v2.1.1
github.com/cespare/xxhash/v2
# github.com/containerd/containerd v1.3.2
## explicit
github.com/containerd/containerd/errdefs
# github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448
## explicit
github.com/containerd/fifo
# github.com/coreos/go-semver v0.3.0
github.com/coreos/go-semver/semver
# github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
## explicit
github.com/coreos/go-systemd/activation
github.com/coreos/go-systemd/journal
github.com/coreos/go-systemd/sdjournal
@ -146,7 +139,6 @@ github.com/coreos/go-systemd/sdjournal
github.com/coreos/pkg/capnslog
github.com/coreos/pkg/dlopen
# github.com/cortexproject/cortex v1.0.1-0.20200424135841-64fb9ad94a38
## explicit
github.com/cortexproject/cortex/pkg/alertmanager
github.com/cortexproject/cortex/pkg/alertmanager/alerts
github.com/cortexproject/cortex/pkg/alertmanager/alerts/configdb
@ -225,15 +217,12 @@ github.com/cortexproject/cortex/pkg/util/spanlogger
github.com/cortexproject/cortex/pkg/util/test
github.com/cortexproject/cortex/pkg/util/validation
# github.com/davecgh/go-spew v1.1.1
## explicit
github.com/davecgh/go-spew/spew
# github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/dgrijalva/jwt-go
# github.com/docker/distribution v2.7.1+incompatible
## explicit
github.com/docker/distribution/registry/api/errcode
# github.com/docker/docker v0.7.3-0.20190817195342-4760db040282
## explicit
github.com/docker/docker/api/types
github.com/docker/docker/api/types/backend
github.com/docker/docker/api/types/blkiodev
@ -273,39 +262,30 @@ github.com/docker/go-connections/nat
github.com/docker/go-connections/sockets
github.com/docker/go-connections/tlsconfig
# github.com/docker/go-metrics v0.0.0-20181218153428-b84716841b82
## explicit
github.com/docker/go-metrics
# github.com/docker/go-plugins-helpers v0.0.0-20181025120712-1e6269c305b8
## explicit
github.com/docker/go-plugins-helpers/sdk
# github.com/docker/go-units v0.4.0
github.com/docker/go-units
# github.com/dustin/go-humanize v1.0.0
## explicit
github.com/dustin/go-humanize
# github.com/edsrzf/mmap-go v1.0.0
github.com/edsrzf/mmap-go
# github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb
github.com/facette/natsort
# github.com/fatih/color v1.7.0
## explicit
github.com/fatih/color
# github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c
## explicit
github.com/fluent/fluent-bit-go/output
# github.com/frankban/quicktest v1.7.2
## explicit
# github.com/fsnotify/fsnotify v1.4.7
github.com/fsnotify/fsnotify
# github.com/fsouza/fake-gcs-server v1.7.0
github.com/fsouza/fake-gcs-server/fakestorage
github.com/fsouza/fake-gcs-server/internal/backend
# github.com/go-kit/kit v0.9.0
## explicit
github.com/go-kit/kit/log
github.com/go-kit/kit/log/level
# github.com/go-logfmt/logfmt v0.4.0
## explicit
github.com/go-logfmt/logfmt
# github.com/go-openapi/analysis v0.19.4
github.com/go-openapi/analysis
@ -345,7 +325,6 @@ github.com/gocql/gocql/internal/streams
# github.com/gogo/googleapis v1.1.0
github.com/gogo/googleapis/google/rpc
# github.com/gogo/protobuf v1.3.1
## explicit
github.com/gogo/protobuf/gogoproto
github.com/gogo/protobuf/io
github.com/gogo/protobuf/proto
@ -382,7 +361,6 @@ github.com/golang/protobuf/ptypes/struct
github.com/golang/protobuf/ptypes/timestamp
github.com/golang/protobuf/ptypes/wrappers
# github.com/golang/snappy v0.0.1
## explicit
github.com/golang/snappy
# github.com/gomodule/redigo v2.0.0+incompatible
github.com/gomodule/redigo/internal
@ -422,10 +400,8 @@ github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects
github.com/gophercloud/gophercloud/openstack/utils
github.com/gophercloud/gophercloud/pagination
# github.com/gorilla/mux v1.7.1
## explicit
github.com/gorilla/mux
# github.com/gorilla/websocket v1.4.0
## explicit
github.com/gorilla/websocket
# github.com/grpc-ecosystem/go-grpc-middleware v1.1.0
github.com/grpc-ecosystem/go-grpc-middleware
@ -433,7 +409,6 @@ github.com/grpc-ecosystem/go-grpc-middleware/tags
github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing
github.com/grpc-ecosystem/go-grpc-middleware/util/metautils
# github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340
## explicit
github.com/grpc-ecosystem/go-grpc-prometheus
github.com/grpc-ecosystem/go-grpc-prometheus/packages/grpcstatus
# github.com/grpc-ecosystem/grpc-gateway v1.12.1
@ -441,7 +416,6 @@ github.com/grpc-ecosystem/grpc-gateway/internal
github.com/grpc-ecosystem/grpc-gateway/runtime
github.com/grpc-ecosystem/grpc-gateway/utilities
# github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
## explicit
github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc
# github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed
github.com/hailocab/go-hostpool
@ -462,7 +436,6 @@ github.com/hashicorp/go-rootcerts
# github.com/hashicorp/go-sockaddr v1.0.2
github.com/hashicorp/go-sockaddr
# github.com/hashicorp/golang-lru v0.5.3
## explicit
github.com/hashicorp/golang-lru
github.com/hashicorp/golang-lru/simplelru
# github.com/hashicorp/memberlist v0.1.5
@ -470,14 +443,12 @@ github.com/hashicorp/memberlist
# github.com/hashicorp/serf v0.8.5
github.com/hashicorp/serf/coordinate
# github.com/hpcloud/tail v1.0.0 => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
## explicit
github.com/hpcloud/tail
github.com/hpcloud/tail/ratelimiter
github.com/hpcloud/tail/util
github.com/hpcloud/tail/watch
github.com/hpcloud/tail/winfile
# github.com/influxdata/go-syslog/v2 v2.0.1
## explicit
github.com/influxdata/go-syslog/v2
github.com/influxdata/go-syslog/v2/common
github.com/influxdata/go-syslog/v2/nontransparent
@ -486,14 +457,12 @@ github.com/influxdata/go-syslog/v2/rfc5424
# github.com/jessevdk/go-flags v1.4.0
github.com/jessevdk/go-flags
# github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
## explicit
github.com/jmespath/go-jmespath
# github.com/jonboulle/clockwork v0.1.0
github.com/jonboulle/clockwork
# github.com/jpillora/backoff v1.0.0
github.com/jpillora/backoff
# github.com/json-iterator/go v1.1.9
## explicit
github.com/json-iterator/go
# github.com/jstemmer/go-junit-report v0.9.1
github.com/jstemmer/go-junit-report
@ -502,7 +471,6 @@ github.com/jstemmer/go-junit-report/parser
# github.com/julienschmidt/httprouter v1.3.0
github.com/julienschmidt/httprouter
# github.com/klauspost/compress v1.9.4
## explicit
github.com/klauspost/compress/flate
github.com/klauspost/compress/gzip
# github.com/konsorten/go-windows-terminal-sequences v1.0.2
@ -546,17 +514,14 @@ github.com/minio/sha256-simd
# github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-homedir
# github.com/mitchellh/mapstructure v1.1.2
## explicit
github.com/mitchellh/mapstructure
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
github.com/modern-go/concurrent
# github.com/modern-go/reflect2 v1.0.1
github.com/modern-go/reflect2
# github.com/morikuni/aec v1.0.0
## explicit
github.com/morikuni/aec
# github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f
## explicit
github.com/mwitkow/go-conntrack
# github.com/ncw/swift v1.0.50
github.com/ncw/swift
@ -574,16 +539,13 @@ github.com/opentracing-contrib/go-grpc
# github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9
github.com/opentracing-contrib/go-stdlib/nethttp
# github.com/opentracing/opentracing-go v1.1.1-0.20200124165624-2876d2018785
## explicit
github.com/opentracing/opentracing-go
github.com/opentracing/opentracing-go/ext
github.com/opentracing/opentracing-go/log
# github.com/pierrec/lz4 v2.5.3-0.20200429092203-e876bbd321b3+incompatible
## explicit
github.com/pierrec/lz4
github.com/pierrec/lz4/internal/xxh32
# github.com/pkg/errors v0.9.1
## explicit
github.com/pkg/errors
# github.com/pmezard/go-difflib v1.0.0
github.com/pmezard/go-difflib/difflib
@ -628,7 +590,6 @@ github.com/prometheus/alertmanager/template
github.com/prometheus/alertmanager/types
github.com/prometheus/alertmanager/ui
# github.com/prometheus/client_golang v1.5.0
## explicit
github.com/prometheus/client_golang/api
github.com/prometheus/client_golang/api/prometheus/v1
github.com/prometheus/client_golang/prometheus
@ -638,10 +599,8 @@ github.com/prometheus/client_golang/prometheus/promhttp
github.com/prometheus/client_golang/prometheus/push
github.com/prometheus/client_golang/prometheus/testutil
# github.com/prometheus/client_model v0.2.0
## explicit
github.com/prometheus/client_model/go
# github.com/prometheus/common v0.9.1
## explicit
github.com/prometheus/common/config
github.com/prometheus/common/expfmt
github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg
@ -653,7 +612,6 @@ github.com/prometheus/procfs
github.com/prometheus/procfs/internal/fs
github.com/prometheus/procfs/internal/util
# github.com/prometheus/prometheus v1.8.2-0.20200213233353-b90be6f32a33
## explicit
github.com/prometheus/prometheus/config
github.com/prometheus/prometheus/discovery
github.com/prometheus/prometheus/discovery/azure
@ -721,12 +679,10 @@ github.com/segmentio/fasthash/fnv1a
# github.com/sercand/kuberesolver v2.1.0+incompatible
github.com/sercand/kuberesolver
# github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
## explicit
github.com/shurcooL/httpfs/filter
github.com/shurcooL/httpfs/union
github.com/shurcooL/httpfs/vfsutil
# github.com/shurcooL/vfsgen v0.0.0-20181202132449-6a9ea43bcacd
## explicit
github.com/shurcooL/vfsgen
# github.com/sirupsen/logrus v1.4.2
github.com/sirupsen/logrus
@ -740,7 +696,6 @@ github.com/spf13/pflag
# github.com/stretchr/objx v0.2.0
github.com/stretchr/objx
# github.com/stretchr/testify v1.5.1
## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/mock
github.com/stretchr/testify/require
@ -777,10 +732,8 @@ github.com/thanos-io/thanos/pkg/tracing
# github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5
github.com/tmc/grpc-websocket-proxy/wsproxy
# github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448
## explicit
github.com/tonistiigi/fifo
# github.com/uber/jaeger-client-go v2.20.1+incompatible
## explicit
github.com/uber/jaeger-client-go
github.com/uber/jaeger-client-go/config
github.com/uber/jaeger-client-go/internal/baggage
@ -801,12 +754,9 @@ github.com/uber/jaeger-client-go/utils
# github.com/uber/jaeger-lib v2.2.0+incompatible
github.com/uber/jaeger-lib/metrics
github.com/uber/jaeger-lib/metrics/prometheus
# github.com/ugorji/go v1.1.7
## explicit
# github.com/ugorji/go/codec v1.1.7
github.com/ugorji/go/codec
# github.com/weaveworks/common v0.0.0-20200310113808-2708ba4e60a4
## explicit
github.com/weaveworks/common/aws
github.com/weaveworks/common/errors
github.com/weaveworks/common/grpc
@ -825,10 +775,8 @@ github.com/weaveworks/promrus
# github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2
github.com/xiang90/probing
# go.etcd.io/bbolt v1.3.3
## explicit
go.etcd.io/bbolt
# go.etcd.io/etcd v0.0.0-20200401174654-e694b7bb0875
## explicit
go.etcd.io/etcd/auth
go.etcd.io/etcd/auth/authpb
go.etcd.io/etcd/client
@ -960,7 +908,6 @@ golang.org/x/lint/golint
golang.org/x/mod/module
golang.org/x/mod/semver
# golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
## explicit
golang.org/x/net/bpf
golang.org/x/net/context
golang.org/x/net/context/ctxhttp
@ -1061,7 +1008,6 @@ google.golang.org/genproto/googleapis/rpc/status
google.golang.org/genproto/googleapis/type/expr
google.golang.org/genproto/protobuf/field_mask
# google.golang.org/grpc v1.25.1
## explicit
google.golang.org/grpc
google.golang.org/grpc/backoff
google.golang.org/grpc/balancer
@ -1115,10 +1061,8 @@ google.golang.org/grpc/status
google.golang.org/grpc/tap
google.golang.org/grpc/test/bufconn
# gopkg.in/alecthomas/kingpin.v2 v2.2.6
## explicit
gopkg.in/alecthomas/kingpin.v2
# gopkg.in/fsnotify.v1 v1.4.7
## explicit
gopkg.in/fsnotify.v1
# gopkg.in/fsnotify/fsnotify.v1 v1.4.7
gopkg.in/fsnotify/fsnotify.v1
@ -1129,7 +1073,6 @@ gopkg.in/ini.v1
# gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7
gopkg.in/tomb.v1
# gopkg.in/yaml.v2 v2.2.7
## explicit
gopkg.in/yaml.v2
# gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2
gopkg.in/yaml.v3
@ -1296,7 +1239,6 @@ k8s.io/client-go/util/keyutil
k8s.io/client-go/util/retry
k8s.io/client-go/util/workqueue
# k8s.io/klog v1.0.0
## explicit
k8s.io/klog
# k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6
k8s.io/utils/buffer
@ -1307,7 +1249,3 @@ rsc.io/binaryregexp
rsc.io/binaryregexp/syntax
# sigs.k8s.io/yaml v1.1.0
sigs.k8s.io/yaml
# github.com/hpcloud/tail => github.com/grafana/tail v0.0.0-20191024143944-0b54ddf21fe7
# k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085101-78d2af792bab
# github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v36.2.0+incompatible
# github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.0+incompatible

Loading…
Cancel
Save