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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ test:
# of the host into the container. For now this is the only way to run the e2e
# tests on Mac OS with apple silicon as the shim requires GOOS=linux.
docker-test-e2e: build-test
docker run --rm -ti --privileged --network=host --rm -v $(DOCKER_SOCK):$(DOCKER_SOCK) -v $(PWD):/app $(TEST_IMAGE) make test-e2e
docker run --rm -ti --privileged --network=host --rm -v $(DOCKER_SOCK):$(DOCKER_SOCK) -v $(PWD):/app $(TEST_IMAGE) go test -timeout=30m -v ./e2e/ $(testargs)

docker-bench: build-test
docker run --rm -ti --privileged --network=host --rm -v $(DOCKER_SOCK):$(DOCKER_SOCK) -v $(PWD):/app $(TEST_IMAGE) make bench
Expand Down
13 changes: 13 additions & 0 deletions activator/activator_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package activator

import (
"bufio"
"context"
"fmt"
"io"
Expand Down Expand Up @@ -67,6 +68,12 @@ func TestActivator(t *testing.T) {
parallelReqs: 1,
expectedBody: "",
connHook: func(conn net.Conn) (net.Conn, bool, error) {
// read request, else we might run into
// https://github.com/golang/go/issues/31259
_, err := http.ReadRequest(bufio.NewReader(conn))
if err != nil {
return conn, false, err
}
resp := http.Response{
StatusCode: http.StatusForbidden,
}
Expand All @@ -79,6 +86,12 @@ func TestActivator(t *testing.T) {
parallelReqs: 1,
expectedBody: "",
connHook: func(conn net.Conn) (net.Conn, bool, error) {
// read request, else we might run into
// https://github.com/golang/go/issues/31259
_, err := http.ReadRequest(bufio.NewReader(conn))
if err != nil {
return conn, false, err
}
resp := http.Response{
StatusCode: http.StatusForbidden,
}
Expand Down
27 changes: 14 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/cilium/ebpf v0.19.0
github.com/containerd/cgroups/v3 v3.0.5
github.com/containerd/containerd/api v1.9.0
github.com/containerd/containerd/v2 v2.1.5
github.com/containerd/containerd/v2 v2.1.6
github.com/containerd/errdefs v1.0.0
github.com/containerd/errdefs/pkg v0.3.0
github.com/containerd/fifo v1.1.0
Expand All @@ -16,8 +16,8 @@ require (
github.com/containerd/plugin v1.0.0
github.com/containerd/ttrpc v1.2.7
github.com/containerd/typeurl/v2 v2.2.3
github.com/containernetworking/plugins v1.7.1
github.com/coreos/go-systemd/v22 v22.5.0
github.com/containernetworking/plugins v1.9.0
github.com/coreos/go-systemd/v22 v22.6.0
github.com/fsnotify/fsnotify v1.9.0
github.com/go-logr/logr v1.4.3
github.com/icza/backscanner v0.0.0-20241124160932-dff01ac50250
Expand All @@ -33,8 +33,8 @@ require (
github.com/prometheus/common v0.62.0
github.com/prometheus/procfs v0.15.1
github.com/stretchr/testify v1.10.0
github.com/vishvananda/netlink v1.3.1-0.20250303224720-0e7078ed04c8
golang.org/x/sys v0.35.0
github.com/vishvananda/netlink v1.3.1
golang.org/x/sys v0.38.0
google.golang.org/protobuf v1.36.7
k8s.io/api v0.34.0
k8s.io/apimachinery v0.34.0
Expand Down Expand Up @@ -63,7 +63,8 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/containerd/console v1.0.4 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/platforms v1.0.0-rc.1 // indirect
github.com/containerd/platforms v1.0.0-rc.2 // indirect
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
Expand Down Expand Up @@ -116,7 +117,7 @@ require (
github.com/nwaples/rardecode/v2 v2.2.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/opencontainers/selinux v1.12.0 // indirect
github.com/opencontainers/selinux v1.13.1 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pierrec/lz4/v4 v4.1.22 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
Expand All @@ -139,14 +140,14 @@ require (
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/mod v0.29.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.28.0 // indirect
golang.org/x/sync v0.17.0 // indirect
golang.org/x/term v0.34.0 // indirect
golang.org/x/text v0.29.0 // indirect
golang.org/x/sync v0.18.0 // indirect
golang.org/x/term v0.37.0 // indirect
golang.org/x/text v0.31.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.36.0 // indirect
golang.org/x/tools v0.38.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/grpc v1.72.2 // indirect
Expand Down
Loading