Skip to content
Merged
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
4 changes: 2 additions & 2 deletions .github/workflows/go.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}
Expand Down Expand Up @@ -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') }}
Expand Down
10 changes: 6 additions & 4 deletions db/thanos.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -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)
Expand All @@ -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)
}
Expand Down Expand Up @@ -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)
}
Expand Down
Loading