Merge branch 'main' into merge-release-0.23-to-main

thanos-io · Dec 31, 2021 · b0d054f · b0d054f
2 parents fb97c9a + 0aa21c3
commit b0d054f
Show file tree

Hide file tree

Showing 406 changed files with 42,422 additions and 30,426 deletions.
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -23,17 +23,17 @@ $(ALERTMANAGER): $(BINGO_DIR)/alertmanager.mod
 	@echo "(re)installing $(GOBIN)/alertmanager-v0.20.0"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=alertmanager.mod -o=$(GOBIN)/alertmanager-v0.20.0 "github.com/prometheus/alertmanager/cmd/alertmanager"
 
-BINGO := $(GOBIN)/bingo-v0.4.3
+BINGO := $(GOBIN)/bingo-v0.5.2
 $(BINGO): $(BINGO_DIR)/bingo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/bingo-v0.4.3"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.4.3 "github.com/bwplotka/bingo"
+	@echo "(re)installing $(GOBIN)/bingo-v0.5.2"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.5.2 "github.com/bwplotka/bingo"
 
-FAILLINT := $(GOBIN)/faillint-v1.5.0
+FAILLINT := $(GOBIN)/faillint-v1.8.0
 $(FAILLINT): $(BINGO_DIR)/faillint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/faillint-v1.5.0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.5.0 "github.com/fatih/faillint"
+	@echo "(re)installing $(GOBIN)/faillint-v1.8.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=faillint.mod -o=$(GOBIN)/faillint-v1.8.0 "github.com/fatih/faillint"
 
 GO_BINDATA := $(GOBIN)/go-bindata-v3.1.1+incompatible
 $(GO_BINDATA): $(BINGO_DIR)/go-bindata.mod
@@ -59,6 +59,12 @@ $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@echo "(re)installing $(GOBIN)/golangci-lint-v1.39.1-0.20210330125642-6844f6abf817"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.39.1-0.20210330125642-6844f6abf817 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
+GOTESPLIT := $(GOBIN)/gotesplit-v0.1.2
+$(GOTESPLIT): $(BINGO_DIR)/gotesplit.mod
+	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
+	@echo "(re)installing $(GOBIN)/gotesplit-v0.1.2"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=gotesplit.mod -o=$(GOBIN)/gotesplit-v0.1.2 "github.com/Songmu/gotesplit/cmd/gotesplit"
+
 HUGO := $(GOBIN)/hugo-v0.80.0
 $(HUGO): $(BINGO_DIR)/hugo.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
@@ -71,11 +77,11 @@ $(JB): $(BINGO_DIR)/jb.mod
 	@echo "(re)installing $(GOBIN)/jb-v0.4.0"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jb.mod -o=$(GOBIN)/jb-v0.4.0 "github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb"
 
-JSONNET_LINT := $(GOBIN)/jsonnet-lint-v0.17.1-0.20210113194615-cd59751527e0
+JSONNET_LINT := $(GOBIN)/jsonnet-lint-v0.17.1-0.20211101230100-b10eae7c683a
 $(JSONNET_LINT): $(BINGO_DIR)/jsonnet-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/jsonnet-lint-v0.17.1-0.20210113194615-cd59751527e0"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnet-lint.mod -o=$(GOBIN)/jsonnet-lint-v0.17.1-0.20210113194615-cd59751527e0 "github.com/google/go-jsonnet/cmd/jsonnet-lint"
+	@echo "(re)installing $(GOBIN)/jsonnet-lint-v0.17.1-0.20211101230100-b10eae7c683a"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnet-lint.mod -o=$(GOBIN)/jsonnet-lint-v0.17.1-0.20211101230100-b10eae7c683a "github.com/google/go-jsonnet/cmd/jsonnet-lint"
 
 JSONNET := $(GOBIN)/jsonnet-v0.17.0
 $(JSONNET): $(BINGO_DIR)/jsonnet.mod
@@ -89,11 +95,11 @@ $(JSONNETFMT): $(BINGO_DIR)/jsonnetfmt.mod
 	@echo "(re)installing $(GOBIN)/jsonnetfmt-v0.17.0"
 	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=jsonnetfmt.mod -o=$(GOBIN)/jsonnetfmt-v0.17.0 "github.com/google/go-jsonnet/cmd/jsonnetfmt"
 
-MDOX := $(GOBIN)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b
+MDOX := $(GOBIN)/mdox-v0.9.0
 $(MDOX): $(BINGO_DIR)/mdox.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b"
-	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.2.2-0.20210818122826-f16709a2bc2b "github.com/bwplotka/mdox"
+	@echo "(re)installing $(GOBIN)/mdox-v0.9.0"
+	@cd $(BINGO_DIR) && $(GO) build -mod=mod -modfile=mdox.mod -o=$(GOBIN)/mdox-v0.9.0 "github.com/bwplotka/mdox"
 
 MINIO := $(GOBIN)/minio-v0.0.0-20200527010300-cccf2de129da
 $(MINIO): $(BINGO_DIR)/minio.mod

diff --git a/.bingo/bingo.mod b/.bingo/bingo.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.14
 
-require github.com/bwplotka/bingo v0.4.3
+require github.com/bwplotka/bingo v0.5.2
diff --git a/.bingo/faillint.mod b/.bingo/faillint.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.14
 
-require github.com/fatih/faillint v1.5.0
+require github.com/fatih/faillint v1.8.0
diff --git a/.bingo/gotesplit.mod b/.bingo/gotesplit.mod
@@ -0,0 +1,5 @@
+module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
+
+go 1.17
+
+require github.com/Songmu/gotesplit v0.1.2 // cmd/gotesplit
diff --git a/.bingo/jsonnet-lint.mod b/.bingo/jsonnet-lint.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.16
 
-require github.com/google/go-jsonnet v0.17.1-0.20210113194615-cd59751527e0 // cmd/jsonnet-lint
+require github.com/google/go-jsonnet v0.17.1-0.20211101230100-b10eae7c683a // cmd/jsonnet-lint
diff --git a/.bingo/mdox.mod b/.bingo/mdox.mod
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.16
 
-require github.com/bwplotka/mdox v0.2.2-0.20210818122826-f16709a2bc2b
+require github.com/bwplotka/mdox v0.9.0
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -10,9 +10,9 @@ fi
 
 ALERTMANAGER="${GOBIN}/alertmanager-v0.20.0"
 
-BINGO="${GOBIN}/bingo-v0.4.3"
+BINGO="${GOBIN}/bingo-v0.5.2"
 
-FAILLINT="${GOBIN}/faillint-v1.5.0"
+FAILLINT="${GOBIN}/faillint-v1.8.0"
 
 GO_BINDATA="${GOBIN}/go-bindata-v3.1.1+incompatible"
 
@@ -22,17 +22,19 @@ GOJSONTOYAML="${GOBIN}/gojsontoyaml-v0.0.0-20191212081931-bf2969bbd742"
 
 GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.39.1-0.20210330125642-6844f6abf817"
 
+GOTESPLIT="${GOBIN}/gotesplit-v0.1.2"
+
 HUGO="${GOBIN}/hugo-v0.80.0"
 
 JB="${GOBIN}/jb-v0.4.0"
 
-JSONNET_LINT="${GOBIN}/jsonnet-lint-v0.17.1-0.20210113194615-cd59751527e0"
+JSONNET_LINT="${GOBIN}/jsonnet-lint-v0.17.1-0.20211101230100-b10eae7c683a"
 
 JSONNET="${GOBIN}/jsonnet-v0.17.0"
 
 JSONNETFMT="${GOBIN}/jsonnetfmt-v0.17.0"
 
-MDOX="${GOBIN}/mdox-v0.2.2-0.20210818122826-f16709a2bc2b"
+MDOX="${GOBIN}/mdox-v0.9.0"
 
 MINIO="${GOBIN}/minio-v0.0.0-20200527010300-cccf2de129da"
 

diff --git a/.busybox-versions b/.busybox-versions
@@ -0,0 +1,6 @@
+# Auto generated by busybox-updater.sh. DO NOT EDIT
+amd64=768a51a5f71827471e6e58f0d6200c2fa24f2cb5cde1ecbd67fe28f93d4ef464
+arm64=042d6195e1793b226d1632117cccb4c4906c8ab393b8b68328ad43cf59c64f9d
+arm=239809417d1e79388ae1bdb59c167d86f18ebaad37dafb5a93d241fe3c79b0df
+ppc64le=f30732299f06265688d63a454723a0d718c7509f51b0dacb9bf7f58388bb32b2
+s390x=97babce614354ac9a263fa7c8e48a5b062318a9ae77f6c31179bf6fb2200106f
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,11 +7,11 @@ orbs:
 executors:
   golang:
     docker:
-      - image: cimg/go:1.16-node
+      - image: cimg/go:1.17-node
   golang-test:
     docker:
-      - image: cimg/go:1.16-node
-      - image: beaukode/docker-swift-onlyone-authv2-keystone
+      - image: cimg/go:1.17-node
+      - image: quay.io/thanos/docker-swift-onlyone-authv2-keystone:v0.1
 
 jobs:
   test:
@@ -22,7 +22,7 @@ jobs:
       - checkout
       - go/mod-download-cached
       - setup_remote_docker:
-          version: 17.07.0-ce
+          version: 18.06.0-ce
       - run:
           name: Create Secret if PR is not forked
           # GCS integration tests are run only for author's PR that have write access, because these tests
@@ -74,39 +74,46 @@ jobs:
       - checkout
       - go/mod-download-cached
       - setup_remote_docker:
-          version: 17.07.0-ce
+          version: 18.06.0-ce
       - attach_workspace:
           at: .
-      - run: ln -s .build/linux-amd64/thanos thanos
-      - run: make docker
-      - run: docker run thanos --help
+      # Register qemu to support multi-arch.
+      - run: docker run --privileged tonistiigi/binfmt:qemu-v6.1.0 --install all
+      - run: make crossbuild
+      - run: make docker-build
+      - run: make docker-test
       # Upload to both dockerhub and quay.io.
       - run: echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
       - run: make docker-push DOCKER_IMAGE_REPO=thanosio/thanos
+      - run: make docker-manifest DOCKER_IMAGE_REPO=thanosio/thanos
       - run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
       - run: make docker-push
+      - run: make docker-manifest
 
   publish_release:
     executor: golang
     steps:
       - checkout
       - go/mod-download-cached
       - setup_remote_docker:
-          version: 17.07.0-ce
+          version: 18.06.0-ce
       - attach_workspace:
           at: .
       - run: make tarballs-release
       - store_artifacts:
           path: .tarballs
           destination: releases
-      - run: ln -s .build/linux-amd64/thanos thanos
-      - run: make docker
-      - run: docker run thanos --help
+      # Register qemu to support multi-arch.
+      - run: docker run --privileged tonistiigi/binfmt:qemu-v6.1.0 --install all
+      - run: make docker-build
+      - run: make docker-test
       # Upload to both dockerhub and quay.io.
       - run: echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USERNAME}" --password-stdin
       - run: make docker-push DOCKER_IMAGE_REPO=thanosio/thanos DOCKER_IMAGE_TAG=$CIRCLE_TAG
+      - run: make docker-manifest DOCKER_IMAGE_REPO=thanosio/thanos DOCKER_IMAGE_TAG=$CIRCLE_TAG
       - run: echo "${QUAY_PASSWORD}" | docker login -u="${QUAY_USERNAME}" quay.io --password-stdin
       - run: make docker-push DOCKER_IMAGE_TAG=$CIRCLE_TAG
+      - run: make docker-manifest DOCKER_IMAGE_TAG=$CIRCLE_TAG
 
 workflows:
   version: 2

diff --git a/.dockerignore b/.dockerignore
@@ -14,7 +14,6 @@ data/
 test/e2e/e2e_integration_test*
 
 # Ignore promu artifacts.
-/.build
 /.release
 /.tarballs
 

diff --git a/.errcheck_excludes.txt b/.errcheck_excludes.txt
@@ -1,3 +1,3 @@
-(github.com/go-kit/kit/log.Logger).Log
+(github.com/go-kit/log.Logger).Log
 fmt.Fprintln
 fmt.Fprint
diff --git a/.github/workflows/container-version.yaml b/.github/workflows/container-version.yaml
@@ -0,0 +1,27 @@
+on:
+  schedule:
+    - cron: '37 13 * * *'
+name: busybox-update workflow
+jobs:
+  checkVersionAndCreatePR:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run busybox updater
+        run: |
+          chmod +x ./scripts/busybox-updater.sh
+          ./scripts/busybox-updater.sh
+        shell: bash
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          signoff: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: 'Updates busybox SHA'
+          branch: update-sha-action
+          delete-branch: true
+          title: '*: Updates Prometheus BusyBox image SHAs'
+          body: >
+            This PR is auto-generated by 
+            [create-pull-request](https://github.com/peter-evans/create-pull-request).
+          labels: busybox, automated pr
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -20,7 +20,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
 
       - uses: actions/cache@v1
         with:

diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml
@@ -18,7 +18,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.x
+          go-version: 1.17.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.16.x
+          go-version: 1.17.x
 
       - uses: actions/cache@v1
         with:
@@ -55,6 +55,11 @@ jobs:
       - name: Linting & vetting.
         run: make go-lint
   e2e:
+    strategy:
+      fail-fast: true
+      matrix:
+        parallelism: [4]
+        index: [0,1,2,3]  
     runs-on: ubuntu-latest
     name: Thanos end-to-end tests
     env:
@@ -63,7 +68,7 @@ jobs:
       - name: Install Go.
         uses: actions/setup-go@v1
         with:
-          go-version: 1.16.x
+          go-version: 1.17.x
 
       - name: Check out code into the Go module directory.
         uses: actions/checkout@v2
@@ -74,4 +79,4 @@ jobs:
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
 
       - name: Run e2e docker-based tests.
-        run: make test-e2e
+        run: make test-e2e GH_PARALLEL=${{ matrix.parallelism }} GH_INDEX=${{ matrix.index }}
diff --git a/.github/workflows/mixin.yaml b/.github/workflows/mixin.yaml
@@ -0,0 +1,46 @@
+name: mixin
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: Set up Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: ^1.17
+
+      - name: Generate
+        run: make examples
+
+      - name: Check
+        run: make check-examples
+
+  lint:
+    runs-on: ubuntu-latest
+    name: Linters (Static Analysis) for Jsonnet (mixin)
+    steps:
+      - name: Checkout code into the Go module directory.
+        uses: actions/checkout@v2
+
+      - name: Install Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.17.x
+
+      - name: Format
+        run: |
+          make jsonnet-format
+          git diff --exit-code
+
+      - name: Linting
+        run: make jsonnet-lint
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ kube/.minikube
 
 # Ignore e2e working dirs.
 data/
-test/e2e/e2e_integration_test*
+test/e2e/e2e_*
 
 # Ignore promu artifacts.
 /.build

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.16
+1.17
diff --git a/.mdox.validate.yaml b/.mdox.validate.yaml
@@ -16,4 +16,7 @@ validators:
     type: 'ignore'
   # 301 errors even when curl-ed.
   - regex: 'envoyproxy\.io'
-    type: 'ignore'
+    type: 'ignore'
+  # couldn't reach even when curl-ed.
+  - regex: 'cloud\.baidu\.com'
+    type: 'ignore'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

		go 1.14

		require github.com/bwplotka/bingo v0.4.3
		require github.com/bwplotka/bingo v0.5.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

		go 1.16

		require github.com/google/go-jsonnet v0.17.1-0.20210113194615-cd59751527e0 // cmd/jsonnet-lint
		require github.com/google/go-jsonnet v0.17.1-0.20211101230100-b10eae7c683a // cmd/jsonnet-lint