From b4b3e24ea30d37feea3d575fca9b789d07e21256 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Thu, 4 Dec 2025 10:05:11 +0100 Subject: [PATCH 1/2] 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 --- db/thanos.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/db/thanos.go b/db/thanos.go index c6f55c6..905511f 100644 --- a/db/thanos.go +++ b/db/thanos.go @@ -13,8 +13,10 @@ import ( e2eobs "github.com/efficientgo/e2e/observable" ) +const thanosImage = "quay.io/thanos/thanos:v0.40.1" + func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []string, opts ...Option) *e2eobs.Observable { - o := options{image: "quay.io/thanos/thanos:v0.27.0"} + o := options{image: thanosImage} for _, opt := range opts { opt(&o) } @@ -33,7 +35,7 @@ func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []str "--query.max-concurrent": "1", } if len(endpointsAddresses) > 0 { - args["--store"] = strings.Join(endpointsAddresses, ",") + args["--endpoint"] = strings.Join(endpointsAddresses, ",") } if o.flagOverride != nil { args = e2e.MergeFlagsWithoutRemovingEmpty(args, o.flagOverride) @@ -48,7 +50,7 @@ func NewThanosQuerier(env e2e.Environment, name string, endpointsAddresses []str } func NewThanosSidecar(env e2e.Environment, name string, prom e2e.Linkable, opts ...Option) *e2eobs.Observable { - o := options{image: "quay.io/thanos/thanos:v0.27.0"} + o := options{image: thanosImage} for _, opt := range opts { opt(&o) } @@ -78,7 +80,7 @@ func NewThanosSidecar(env e2e.Environment, name string, prom e2e.Linkable, opts } func NewThanosStore(env e2e.Environment, name string, bktConfigYaml []byte, opts ...Option) *e2eobs.Observable { - o := options{image: "quay.io/thanos/thanos:v0.27.0"} + o := options{image: thanosImage} for _, opt := range opts { opt(&o) } From 9acfe293404a0a04a2d5756728a0782d5add8e30 Mon Sep 17 00:00:00 2001 From: Simon Pasquier Date: Thu, 4 Dec 2025 14:56:46 +0100 Subject: [PATCH 2/2] Update actions/cache to v4 Signed-off-by: Simon Pasquier --- .github/workflows/go.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index 71bdd66..84314bd 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -20,7 +20,7 @@ jobs: with: go-version: 1.18.x - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} @@ -60,7 +60,7 @@ jobs: # Configure the Lima guest to forward packets from the col0 bridge to Docker containers. limactl shell colima -- sudo iptables -t filter -A FORWARD -s $IP/24 -d 172.0.0.0/8 -j ACCEPT - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/go/pkg/mod key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}