Skip to content

Commit 44570aa

Browse files
fix: bump default Thanos image to v0.40.1 (#76)
* fix: bump default Thanos image to v0.40.1 This commit also replaces the `--store` argument by `--endpoint` for Thanos Querier. The new argument is available since v0.24.0 but has been removed in v0.38.0. Signed-off-by: Simon Pasquier <spasquie@redhat.com> * Update actions/cache to v4 Signed-off-by: Simon Pasquier <spasquie@redhat.com> --------- Signed-off-by: Simon Pasquier <spasquie@redhat.com>
1 parent 413bbd3 commit 44570aa

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/go.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
with:
2121
go-version: 1.18.x
2222

23-
- uses: actions/cache@v1
23+
- uses: actions/cache@v4
2424
with:
2525
path: ~/go/pkg/mod
2626
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
@@ -60,7 +60,7 @@ jobs:
6060
# Configure the Lima guest to forward packets from the col0 bridge to Docker containers.
6161
limactl shell colima -- sudo iptables -t filter -A FORWARD -s $IP/24 -d 172.0.0.0/8 -j ACCEPT
6262
63-
- uses: actions/cache@v1
63+
- uses: actions/cache@v4
6464
with:
6565
path: ~/go/pkg/mod
6666
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}

db/thanos.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ import (
1313
e2eobs "github.com/efficientgo/e2e/observable"
1414
)
1515

16+
const thanosImage = "quay.io/thanos/thanos:v0.40.1"
17+
1618
func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []string, opts ...Option) *e2eobs.Observable {
17-
o := options{image: "quay.io/thanos/thanos:v0.27.0"}
19+
o := options{image: thanosImage}
1820
for _, opt := range opts {
1921
opt(&o)
2022
}
@@ -33,7 +35,7 @@ func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []str
3335
"--query.max-concurrent": "1",
3436
}
3537
if len(endpointsAddresses) > 0 {
36-
args["--store"] = strings.Join(endpointsAddresses, ",")
38+
args["--endpoint"] = strings.Join(endpointsAddresses, ",")
3739
}
3840
if o.flagOverride != nil {
3941
args = e2e.MergeFlagsWithoutRemovingEmpty(args, o.flagOverride)
@@ -48,7 +50,7 @@ func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []str
4850
}
4951

5052
func NewThanosSidecar(env e2e.Environment, name string, prom e2e.Linkable, opts ...Option) *e2eobs.Observable {
51-
o := options{image: "quay.io/thanos/thanos:v0.27.0"}
53+
o := options{image: thanosImage}
5254
for _, opt := range opts {
5355
opt(&o)
5456
}
@@ -78,7 +80,7 @@ func NewThanosSidecar(env e2e.Environment, name string, prom e2e.Linkable, opts
7880
}
7981

8082
func NewThanosStore(env e2e.Environment, name string, bktConfigYaml []byte, opts ...Option) *e2eobs.Observable {
81-
o := options{image: "quay.io/thanos/thanos:v0.27.0"}
83+
o := options{image: thanosImage}
8284
for _, opt := range opts {
8385
opt(&o)
8486
}

0 commit comments

Comments
 (0)