Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-2.6] Change CGO_ENABLED to 1 / Changed TLS Version to 1.2 #63

Closed
wants to merge 16 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .busybox-versions
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Auto generated by busybox-updater.sh. DO NOT EDIT
amd64=768a51a5f71827471e6e58f0d6200c2fa24f2cb5cde1ecbd67fe28f93d4ef464
arm64=042d6195e1793b226d1632117cccb4c4906c8ab393b8b68328ad43cf59c64f9d
arm=239809417d1e79388ae1bdb59c167d86f18ebaad37dafb5a93d241fe3c79b0df
ppc64le=f30732299f06265688d63a454723a0d718c7509f51b0dacb9bf7f58388bb32b2
s390x=97babce614354ac9a263fa7c8e48a5b062318a9ae77f6c31179bf6fb2200106f
amd64=60ded79a99eb70aa36d57c598707c961ffa4f9f7b63237823a780eaf6d437a78
arm64=d2e2aa8b7fd3d11412c4918ed35bcabc13027ed4812932a94b29940805a87176
arm=53e81f95dc293546ed76257636bd4ec60cba74297ea637aefd37fe9446b66a59
ppc64le=d3f30bf50b2d6e7097ad02a1c3d64c5ffe535b969d80d24bb9543391122d4b8c
s390x=c12940cb7882554a5cb5c582facc2a01a9f30447c1aa067c9c1cca7c9f16c7ee
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ orbs:
executors:
golang:
docker:
- image: cimg/go:1.17-node
- image: cimg/go:1.18-node
golang-test:
docker:
- image: cimg/go:1.17-node
- image: cimg/go:1.18-node
- image: quay.io/thanos/docker-swift-onlyone-authv2-keystone:v0.1

jobs:
Expand All @@ -22,7 +22,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 18.06.0-ce
version: 20.10.11
- 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
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 18.06.0-ce
version: 20.10.11
- attach_workspace:
at: .
# Register qemu to support multi-arch.
Expand All @@ -96,7 +96,7 @@ jobs:
- checkout
- go/mod-download-cached
- setup_remote_docker:
version: 18.06.0-ce
version: 20.10.11
- attach_workspace:
at: .
- run: make tarballs-release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
go-version: 1.18.x

- uses: actions/cache@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Go.
uses: actions/setup-go@v1
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Check out code into the Go module directory
uses: actions/checkout@v1
Expand All @@ -42,7 +42,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
go-version: 1.18.x

- uses: actions/cache@v1
with:
Expand All @@ -68,7 +68,7 @@ jobs:
- name: Install Go.
uses: actions/setup-go@v1
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Check out code into the Go module directory.
uses: actions/checkout@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mixin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.17
go-version: ^1.18

- name: Generate
run: make examples
Expand All @@ -35,7 +35,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v2
with:
go-version: 1.17.x
go-version: 1.18.x

- name: Format
run: |
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17
1.18
2 changes: 1 addition & 1 deletion .promu.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
go:
version: 1.17
version: 1.18
repository:
path: github.com/thanos-io/thanos
build:
Expand Down
1 change: 1 addition & 0 deletions COMPONENT_VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.0
2 changes: 1 addition & 1 deletion Dockerfile.multi-stage
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# By default we pin to amd64 sha. Use make docker to automatically adjust for arm64 versions.
ARG BASE_DOCKER_SHA="14d68ca3d69fceaa6224250c83d81d935c053fb13594c811038c461194599973"
FROM golang:1.17-alpine3.15 as builder
FROM golang:1.18-alpine3.15 as builder

WORKDIR $GOPATH/src/github.com/thanos-io/thanos
# Change in the docker context invalidates the cache so to leverage docker
Expand Down
1 change: 0 additions & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Full list of triage persons is displayed below:
| Name | Slack | GitHub | Company |
|---------------|------------------|------------------------------------------------|---------|
| Adrien Fillon | `@Adrien F` | [@adrien-f](https://github.com/adrien-f) | |
| Ian Billett | `@billett` | [@ianbillett](https://github.com/ianbillett) | Red Hat |
| Martin Chodur | `@FUSAKLA` | [@fusakla](https://github.com/fusakla) | |
| Michael Dai | `@jojohappy` | [@jojohappy](https://github.com/jojohappy) | |
| Xiang Dai | `@daixiang0` | [@daixiang0](https://github.com/daixiang0) | |
Expand Down
9 changes: 9 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
approvers:
- clyang82
- marcolan018
- bjoydeep
- subbarao-meduri
- dislbenn

reviewers:
- morvencao
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,5 @@ See [`Adopters List`](website/data/adopters.yml).
## Maintainers

See [MAINTAINERS.md](MAINTAINERS.md)

Rebuild Image: Thu May 19 15:19:23 EDT 2022
10 changes: 6 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ require (
go.uber.org/atomic v1.9.0
go.uber.org/automaxprocs v1.4.0
go.uber.org/goleak v1.1.12
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce
golang.org/x/net v0.0.0-20220114011407-0dd24b26b47d
golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
Expand Down Expand Up @@ -184,8 +184,8 @@ require (
go.elastic.co/fastjson v1.1.0 // indirect
go.mongodb.org/mongo-driver v1.7.3 // indirect
go.opencensus.io v0.23.0 // indirect
golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
golang.org/x/sys v0.0.0-20220111092808-5a964db01320 // indirect
golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
Expand All @@ -205,6 +205,8 @@ replace (

// TODO: Remove this: https://github.com/thanos-io/thanos/issues/3967.
github.com/minio/minio-go/v7 => github.com/bwplotka/minio-go/v7 v7.0.11-0.20210324165441-f9927e5255a6
// fix CVE-2022-24450
github.com/nats-io/nats-server/v2 => github.com/nats-io/nats-server/v2 v2.7.2
// Make sure Prometheus version is pinned as Prometheus semver does not include Go APIs.
github.com/prometheus/prometheus => github.com/prometheus/prometheus v1.8.2-0.20211119115433-692a54649ed7
github.com/sercand/kuberesolver => github.com/sercand/kuberesolver v2.4.0+incompatible
Expand All @@ -220,4 +222,4 @@ replace (
k8s.io/klog/v2 => github.com/simonpasquier/klog-gokit/v2 v2.0.1
)

go 1.17
go 1.18
Loading
Loading