Skip to content

Commit 2b337bb

Browse files
committed
[WIP] Cgroups v1 cleanup: vendor container-libs
Signed-off-by: Lokesh Mandvekar <lsm5@redhat.com>
1 parent 00b7ca1 commit 2b337bb

File tree

9 files changed

+10
-67
lines changed

9 files changed

+10
-67
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,4 +196,4 @@ require (
196196
tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210 // indirect
197197
)
198198

199-
replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251117194759-eef88fc173c9
199+
replace go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251121154210-570673aac356

go.sum

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec h1:2tTW6cDth2T
239239
github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec/go.mod h1:TmwEoGCwIti7BCeJ9hescZgRtatxRE+A72pCoPfmcfk=
240240
github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422 h1:XvRuyDDRvi+UDxHN/M4MW4HxjmNVMmUKQj/+AbgsYgk=
241241
github.com/linuxkit/virtsock v0.0.0-20241009230534-cb6a20cc0422/go.mod h1:JLgfq4XMVbvfNlAXla/41lZnp21O72a/wWHGJefAvgQ=
242-
github.com/lsm5/container-libs/common v0.0.0-20251117194759-eef88fc173c9 h1:50qNXd+OHTiRBJMADHmnZZbQ0gTTqNSW8GhSe0TEH/0=
243-
github.com/lsm5/container-libs/common v0.0.0-20251117194759-eef88fc173c9/go.mod h1:bWMkqGUJlUwDYe29T0L191jJY0XQZSRVzL+85kI/nd8=
242+
github.com/lsm5/container-libs/common v0.0.0-20251121154210-570673aac356 h1:/KewkTGaJsJG1PL5f4ELiKeEViQR0euTkkHizkKDo+4=
243+
github.com/lsm5/container-libs/common v0.0.0-20251121154210-570673aac356/go.mod h1:8qbjUhjwp4i5u1O19vzwYW2qwIuPdFXIuv4nl3Z8px8=
244244
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0=
245245
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
246246
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
@@ -473,8 +473,6 @@ go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJr
473473
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
474474
go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
475475
go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
476-
go.podman.io/common v0.66.1-0.20251120131032-23712697ddda h1:Ib1vIEYB5eCSz3G09sROyY/j09jztFlWRm4G52vWj3k=
477-
go.podman.io/common v0.66.1-0.20251120131032-23712697ddda/go.mod h1:8qbjUhjwp4i5u1O19vzwYW2qwIuPdFXIuv4nl3Z8px8=
478476
go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda h1:YySc/E4bpD5b5y4kFN/7ZDo5JcXnOpPfwU78kH9D+EU=
479477
go.podman.io/image/v5 v5.38.1-0.20251120131032-23712697ddda/go.mod h1:9DniP9NaGH03kzwNKYEtOXgRJwO+cQHENH+G4sOwLNc=
480478
go.podman.io/storage v1.61.1-0.20251120131032-23712697ddda h1:bC4fEguil4pwVp2U2zKWUC5ouqIwRDdtyJxtX1bPY+0=

vendor/go.podman.io/common/pkg/cgroups/blkio_linux.go

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/common/pkg/cgroups/cgroups_linux.go

Lines changed: 5 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/common/pkg/cgroups/cpu_linux.go

Lines changed: 0 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/common/pkg/cgroups/cpuset_linux.go

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/common/pkg/cgroups/memory_linux.go

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/go.podman.io/common/pkg/cgroups/pids_linux.go

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ go.opentelemetry.io/otel/trace
787787
go.opentelemetry.io/otel/trace/embedded
788788
go.opentelemetry.io/otel/trace/internal/telemetry
789789
go.opentelemetry.io/otel/trace/noop
790-
# go.podman.io/common v0.66.1-0.20251120131032-23712697ddda
790+
# go.podman.io/common v0.66.1-0.20251120131032-23712697ddda => github.com/lsm5/container-libs/common v0.0.0-20251121154210-570673aac356
791791
## explicit; go 1.24.2
792792
go.podman.io/common/internal
793793
go.podman.io/common/internal/attributedstring
@@ -1233,4 +1233,4 @@ tags.cncf.io/container-device-interface/pkg/parser
12331233
# tags.cncf.io/container-device-interface/specs-go v1.0.1-0.20251120202831-139ffec09210
12341234
## explicit; go 1.19
12351235
tags.cncf.io/container-device-interface/specs-go
1236-
# go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251117194759-eef88fc173c9
1236+
# go.podman.io/common => github.com/lsm5/container-libs/common v0.0.0-20251121154210-570673aac356

0 commit comments

Comments
 (0)