Upgrade to Go 1.15 (#3022)

* Upgrade to Go 1.15

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Build CI image dependencies in container

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Fix compiler errors

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

* Use gimme go version for netlify

Signed-off-by: Kemal Akkoyun <kakkoyun@gmail.com>

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2
 defaults: &defaults
   docker:
     # Built by Thanos make docker-ci
-    - image: &default-docker-image quay.io/thanos/thanos-ci:v1.2-go1.14.2-node
+    - image: &default-docker-image quay.io/thanos/thanos-ci:v1.2-go1.15-node
 
 jobs:
   test:
@@ -30,6 +30,7 @@ jobs:
       - run:
           name: "Run unit tests."
           environment:
+            GOBIN: "/go/bin"
             THANOS_TEST_OBJSTORE_SKIP: AZURE,COS,ALIYUNOSS
             # Variables for Swift testing.
             OS_AUTH_URL: http://127.0.0.1:5000/v2.0
@@ -66,6 +67,8 @@ jobs:
   publish_master:
     <<: *defaults
     working_directory: /go/src/github.com/thanos-io/thanos
+    environment:
+      GOBIN: "/go/bin"
     steps:
       - checkout
       - setup_remote_docker:

.dockerignore

@@ -0,0 +1,31 @@
+/prometheus
+/thanos
+/vendor/
+/mixin/vendor/
+node_modules/
+
+# Ignore minikube setup working dirs.
+kube/bin
+kube/.kube
+kube/.minikube
+
+# Ignore e2e working dirs.
+data/
+test/e2e/e2e_integration_test*
+
+# Ignore promu artifacts.
+/.build
+/.release
+/.tarballs
+
+/.idea
+/*.iml
+
+website/public/
+website/docs-pre-processed/
+!website/data
+
+# React build assets
+pkg/ui/static/react
+
+tmp/

.github/workflows/docs.yaml

@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14.x
+          go-version: 1.15.x
 
       - uses: actions/cache@v1
         with:
@@ -30,4 +30,4 @@ jobs:
       - name: Check docs
         run: make check-docs
       - name: Check examples
-        run: make check-examples
+        run: make check-examples

.github/workflows/go.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14.2
+          go-version: 1.15.x
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
@@ -42,7 +42,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.14.x
+          go-version: 1.15.x
 
       - uses: actions/cache@v1
         with:
@@ -63,7 +63,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.14.2
+          go-version: 1.15.x
 
       - name: Check out code into the Go module directory.
         uses: actions/checkout@v2

.go-version

@@ -1 +1 @@
-1.14.2
+1.15

.promu.yml

@@ -1,22 +1,22 @@
 go:
-    version: 1.14.2
+  version: 1.15.0
 repository:
-    path: github.com/thanos-io/thanos
+  path: github.com/thanos-io/thanos
 build:
-    binaries:
-        - name: thanos
-          path: ./cmd/thanos
-    flags: -a -tags netgo
-    ldflags: |
-        -X github.com/prometheus/common/version.Version={{.Version}}
-        -X github.com/prometheus/common/version.Revision={{.Revision}}
-        -X github.com/prometheus/common/version.Branch={{.Branch}}
-        -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
-        -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
+  binaries:
+    - name: thanos
+      path: ./cmd/thanos
+  flags: -a -tags netgo
+  ldflags: |
+    -X github.com/prometheus/common/version.Version={{.Version}}
+    -X github.com/prometheus/common/version.Revision={{.Revision}}
+    -X github.com/prometheus/common/version.Branch={{.Branch}}
+    -X github.com/prometheus/common/version.BuildUser={{user}}@{{host}}
+    -X github.com/prometheus/common/version.BuildDate={{date "20060102-15:04:05"}}
 crossbuild:
-    platforms:
-        - linux/amd64
-        - darwin/amd64
-        - linux/arm64
-        - windows/amd64
-        - freebsd/amd64
+  platforms:
+    - linux/amd64
+    - darwin/amd64
+    - linux/arm64
+    - windows/amd64
+    - freebsd/amd64

Dockerfile.multi-stage

@@ -1,4 +1,4 @@
-FROM golang:1.14.2-alpine3.11 as builder
+FROM golang:1.15-alpine3.12 as builder
 
 WORKDIR $GOPATH/src/github.com/thanos-io/thanos
 # Change in the docker context invalidates the cache so to leverage docker

Dockerfile.thanos-ci

@@ -1,6 +1,13 @@
 # Available from https://hub.docker.com/r/circleci/golang/
-FROM circleci/golang:1.14.2-node
+FROM circleci/golang:1.15 AS builder
 
-ENV GOBIN=/home/circleci/.local/bin
+ENV GOBIN=/go/bin
+ENV BIN_DIR=/go/bin
 
-COPY --chown=circleci tmp/bin/* ${GOBIN}/
+WORKDIR opt
+COPY Makefile .
+COPY .bingo ./.bingo
+RUN make install-deps
+
+FROM circleci/golang:1.15-node
+COPY --from=builder --chown=circleci /go/bin /go/bin/

Makefile

@@ -124,7 +124,6 @@ deps: ## Ensures fresh go.mod and go.sum.
 	@go mod tidy
 	@go mod verify
 
-
 .PHONY: docker
 docker: ## Builds 'thanos' docker with no tag.
 ifeq ($(OS)_$(ARCH), linux_x86_64)
@@ -238,10 +237,6 @@ install-deps: $(ALERTMANAGER) $(MINIO) $(PROMETHEUS_ARRAY)
 .PHONY: docker-ci
 docker-ci: ## Builds and pushes docker image used by our CI. This is done to cache our tools and dependencies. To be run by Thanos maintainer.
 docker-ci: install-deps
-	# Copy all to tmp local dir as this is required by docker.
-	@rm -rf $(BIN_DIR)
-	@mkdir -p $(BIN_DIR)
-	@cp -r $(GOBIN)/* $(BIN_DIR)
 	@docker build -t thanos-ci -f Dockerfile.thanos-ci .
 	@echo ">> pushing thanos-ci image"
 	@docker tag "thanos-ci" "quay.io/thanos/thanos-ci:$(DOCKER_CI_TAG)"

pkg/cacheutil/memcached_server_selector_test.go

@@ -217,7 +217,7 @@ func BenchmarkMemcachedJumpHashSelector_PickServer(b *testing.B) {
 	b.ResetTimer()
 
 	for i := 0; i < b.N; i++ {
-		_, err := selector.PickServer(string(i))
+		_, err := selector.PickServer(fmt.Sprint(i))
 		if err != nil {
 			b.Error(err)
 		}