github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #9971 from containerd/dependabot/go_modules/github.com/checkpoint-restore/go-criu/v7-7.1.0

Browse Source 
build(deps): bump github.com/checkpoint-restore/go-criu/v7 from 7.0.0 to 7.1.0
This commit is contained in:
Phil Estes 2024-03-27 01:23:37 +00:00 committed by GitHub
commit 38a71154c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -9,7 +9,7 @@ require (
github.com/Microsoft/go-winio v0.6.1
github.com/Microsoft/hcsshim v0.12.0
github.com/checkpoint-restore/checkpointctl v1.1.0
github.com/checkpoint-restore/go-criu/v7 v7.0.0
github.com/checkpoint-restore/go-criu/v7 v7.1.0
github.com/containerd/btrfs/v2 v2.0.0
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/console v1.0.4

4
go.sum
View File

@ -60,8 +60,8 @@ github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/checkpoint-restore/checkpointctl v1.1.0 h1:plS/2zBzbAXO6DH/H+TqD7ZGhz8iQVb+NLgsOJSTWaw=
github.com/checkpoint-restore/checkpointctl v1.1.0/go.mod h1:DtPd9M4bt/jdt+7DodFxm0lrzdevabk3cbni/FL4BY0=
github.com/checkpoint-restore/go-criu/v7 v7.0.0 h1:R4UF/njKOuq8ooG7naFGsCeKsjv5j+rIhgFgSSeC2KY=
github.com/checkpoint-restore/go-criu/v7 v7.0.0/go.mod h1:xD1v3cPww1QYpJR3+XTTdC8hYubPnptIPsT1daXhbr4=
github.com/checkpoint-restore/go-criu/v7 v7.1.0 h1:JbQyO4o+P8ycNTMLPiiDqXg49bAcy4WljWCzYQho35A=
github.com/checkpoint-restore/go-criu/v7 v7.1.0/go.mod h1:1svAtmbtvX4BKI45OFzgoTTLG7oYFKdColv/Vcsb2A8=
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

2
vendor/github.com/checkpoint-restore/go-criu/v7/README.md generated vendored
View File

@ -62,7 +62,7 @@ The following table shows the relation between go-criu and criu versions:
| Major version | Latest release | CRIU version |
| -------------- | -------------- | ------------ |
| v7             | 7.0.0         | 3.18         |
| v7             | 7.1.0         | 3.18         |
| v6             | 6.3.0         | 3.17         |
| v5             | 5.3.0         | 3.16         |
| v5             | 5.0.0         | 3.15         |

2
vendor/github.com/checkpoint-restore/go-criu/v7/codecov.yml generated vendored Normal file
View File

@ -0,0 +1,2 @@
ignore:
- "test"

4
vendor/github.com/checkpoint-restore/go-criu/v7/features.go generated vendored
View File

@ -1,7 +1,7 @@
package criu
import (
"fmt"
"errors"
"github.com/checkpoint-restore/go-criu/v7/rpc"
)
@ -38,7 +38,7 @@ func (c *Criu) FeatureCheck(features *rpc.CriuFeatures) (*rpc.CriuFeatures, erro
}
if resp.GetType() != rpc.CriuReqType_FEATURE_CHECK {
return nil, fmt.Errorf("unexpected CRIU RPC response")
return nil, errors.New("unexpected CRIU RPC response")
}
return features, nil

16
vendor/github.com/checkpoint-restore/go-criu/v7/main.go generated vendored
View File

@ -218,7 +218,7 @@ func (c *Criu) StartPageServerChld(opts *rpc.CriuOpts) (int, int, error) {
return 0, 0, err
}
return int(resp.Ps.GetPid()), int(resp.Ps.GetPort()), nil
return int(resp.GetPs().GetPid()), int(resp.GetPs().GetPort()), nil
}
// GetCriuVersion executes the VERSION RPC call and returns the version
@ -230,22 +230,22 @@ func (c *Criu) GetCriuVersion() (int, error) {
}
if resp.GetType() != rpc.CriuReqType_VERSION {
return 0, fmt.Errorf("unexpected CRIU RPC response")
return 0, errors.New("unexpected CRIU RPC response")
}
version := int(*resp.GetVersion().MajorNumber) * 10000
version += int(*resp.GetVersion().MinorNumber) * 100
if resp.GetVersion().Sublevel != nil {
version += int(*resp.GetVersion().Sublevel)
version := resp.GetVersion().GetMajorNumber() * 10000
version += resp.GetVersion().GetMinorNumber() * 100
if resp.GetVersion().GetSublevel() != 0 {
version += resp.GetVersion().GetSublevel()
}
if resp.GetVersion().Gitid != nil {
if resp.GetVersion().GetGitid() != "" {
// taken from runc: if it is a git release -> increase minor by 1
version -= (version % 100)
version += 100
}
return version, nil
return int(version), nil
}
// IsCriuAtLeast checks if the version is at least the same

2
vendor/modules.txt vendored
View File

@ -77,7 +77,7 @@ github.com/cespare/xxhash/v2
# github.com/checkpoint-restore/checkpointctl v1.1.0
## explicit; go 1.18
github.com/checkpoint-restore/checkpointctl/lib
# github.com/checkpoint-restore/go-criu/v7 v7.0.0
# github.com/checkpoint-restore/go-criu/v7 v7.1.0
## explicit; go 1.18
github.com/checkpoint-restore/go-criu/v7
github.com/checkpoint-restore/go-criu/v7/rpc