Merge pull request #257 from kzys/add-v3

AkihiroSuda · web-flow · commit 129bf0adff63 · 2022-11-12T02:14:48.000+09:00
Rename the package to github.com/containerd/cgroups/v3
diff --git a/README.md b/README.md
@@ -153,7 +153,7 @@ so the resulting slice would be located here on disk:
 
 ```go
 import (
-    "github.com/containerd/cgroups/v2/cgroup2"
+    "github.com/containerd/cgroups/v3/cgroup2"
     specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/blkio.go b/cgroup1/blkio.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
diff --git a/cgroup1/blkio_test.go b/cgroup1/blkio_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 )
 
 const data = `major minor  #blocks  name
diff --git a/cgroup1/cgroup.go b/cgroup1/cgroup.go
@@ -28,7 +28,7 @@ import (
 	"syscall"
 	"time"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
diff --git a/cgroup1/control.go b/cgroup1/control.go
@@ -19,7 +19,7 @@ package cgroup1
 import (
 	"os"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/cpu.go b/cgroup1/cpu.go
@@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/cpuacct.go b/cgroup1/cpuacct.go
@@ -24,7 +24,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 )
 
 const nanosecondsInSecond = 1000000000
diff --git a/cgroup1/hugetlb.go b/cgroup1/hugetlb.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/memory.go b/cgroup1/memory.go
@@ -25,7 +25,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"golang.org/x/sys/unix"
 )
diff --git a/cgroup1/memory_test.go b/cgroup1/memory_test.go
@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 )
 
 const memoryData = `cache 1
diff --git a/cgroup1/pids.go b/cgroup1/pids.go
@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/pids_test.go b/cgroup1/pids_test.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"testing"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	"github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/rdma.go b/cgroup1/rdma.go
@@ -23,7 +23,7 @@ import (
 	"strconv"
 	"strings"
 
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/subsystem.go b/cgroup1/subsystem.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/containerd/cgroups/v2"
-	v1 "github.com/containerd/cgroups/v2/cgroup1/stats"
+	"github.com/containerd/cgroups/v3"
+	v1 "github.com/containerd/cgroups/v3/cgroup1/stats"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
 
diff --git a/cgroup1/utils.go b/cgroup1/utils.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/cgroups/v2"
+	"github.com/containerd/cgroups/v3"
 	units "github.com/docker/go-units"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 )
diff --git a/cgroup2/manager.go b/cgroup2/manager.go
@@ -30,7 +30,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/containerd/cgroups/v2/cgroup2/stats"
+	"github.com/containerd/cgroups/v3/cgroup2/stats"
 
 	systemdDbus "github.com/coreos/go-systemd/v22/dbus"
 	"github.com/godbus/dbus/v5"
diff --git a/cgroup2/utils.go b/cgroup2/utils.go
@@ -27,7 +27,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/containerd/cgroups/v2/cgroup2/stats"
+	"github.com/containerd/cgroups/v3/cgroup2/stats"
 
 	"github.com/godbus/dbus/v5"
 	"github.com/opencontainers/runtime-spec/specs-go"
diff --git a/cmd/cgctl/main.go b/cmd/cgctl/main.go
@@ -22,8 +22,8 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/containerd/cgroups/v2"
-	"github.com/containerd/cgroups/v2/cgroup2"
+	"github.com/containerd/cgroups/v3"
+	"github.com/containerd/cgroups/v3/cgroup2"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/go.mod b/cmd/go.mod
@@ -2,10 +2,10 @@ module github.com/containerd/cgroups/cmd
 
 go 1.16
 
-replace github.com/containerd/cgroups/v2 => ../
+replace github.com/containerd/cgroups/v3 => ../
 
 require (
-	github.com/containerd/cgroups/v2 v2.0.0-00010101000000-000000000000
+	github.com/containerd/cgroups/v3 v3.0.0-00010101000000-000000000000
 	github.com/sirupsen/logrus v1.8.1
 	github.com/urfave/cli v1.22.5
 )
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/containerd/cgroups/v2
+module github.com/containerd/cgroups/v3
 
 go 1.17
 

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ so the resulting slice would be located here on disk:`
`153`	`153`
`154`	`154`	```go
`155`	`155`	`import (`
`156`		`- "github.com/containerd/cgroups/v2/cgroup2"`
	`156`	`+ "github.com/containerd/cgroups/v3/cgroup2"`
`157`	`157`	`specs "github.com/opencontainers/runtime-spec/specs-go"`
`158`	`158`	`)`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`"strconv"`
`26`	`26`	`"strings"`
`27`	`27`
`28`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`28`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`29`	`29`
`30`	`30`	`specs "github.com/opencontainers/runtime-spec/specs-go"`
`31`	`31`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"strings"`
`22`	`22`	`"testing"`
`23`	`23`
`24`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`24`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	const data = `major minor #blocks name
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"syscall"`
`29`	`29`	`"time"`
`30`	`30`
`31`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`31`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`32`	`32`
`33`	`33`	`"github.com/opencontainers/runtime-spec/specs-go"`
`34`	`34`	`)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package cgroup1`
`19`	`19`	`import (`
`20`	`20`	`"os"`
`21`	`21`
`22`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`22`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`23`	`23`	`specs "github.com/opencontainers/runtime-spec/specs-go"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"path/filepath"`
`23`	`23`	`"strconv"`
`24`	`24`
`25`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`25`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`26`	`26`	`specs "github.com/opencontainers/runtime-spec/specs-go"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"strconv"`
`25`	`25`	`"strings"`
`26`	`26`
`27`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`27`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const nanosecondsInSecond = 1000000000`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ import (`
`23`	`23`	`"strings"`
`24`	`24`	`"testing"`
`25`	`25`
`26`		`- v1 "github.com/containerd/cgroups/v2/cgroup1/stats"`
	`26`	`+ v1 "github.com/containerd/cgroups/v3/cgroup1/stats"`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	const memoryData = `cache 1