mirror of
https://github.com/containerd/containerd.git
synced 2026-08-13 17:07:26 +00:00
Merge pull request #13812 from ningmingxiao/bump_nri
build: bump github.com/containerd/nri
This commit is contained in:
2
go.mod
2
go.mod
@@ -22,7 +22,7 @@ require (
|
||||
github.com/containerd/go-runc v1.1.0
|
||||
github.com/containerd/imgcrypt/v2 v2.0.2
|
||||
github.com/containerd/log v0.1.0
|
||||
github.com/containerd/nri v0.12.0
|
||||
github.com/containerd/nri v0.12.1
|
||||
github.com/containerd/otelttrpc v0.1.0
|
||||
github.com/containerd/platforms v1.0.0-rc.4
|
||||
github.com/containerd/plugin v1.1.0
|
||||
|
||||
4
go.sum
4
go.sum
@@ -63,8 +63,8 @@ github.com/containerd/imgcrypt/v2 v2.0.2 h1:WOEaE33CaSxzuRF8YLfAjHWuu1Xh27aPPQtq
|
||||
github.com/containerd/imgcrypt/v2 v2.0.2/go.mod h1:8r4JW1b83jkDhaioOUZ7idxIYp+Wn1k4E4KXwy2oSNI=
|
||||
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
|
||||
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
|
||||
github.com/containerd/nri v0.12.0 h1:RvZtyCM64XOB1UmMAFOlfReTTwCd+hE2IEQ5XEpkKA0=
|
||||
github.com/containerd/nri v0.12.0/go.mod h1:TGAfPLH4a+qwbv0PxsefPiR+PobYecDj2aXMtz7GQcg=
|
||||
github.com/containerd/nri v0.12.1 h1:Nkp14W/mdhP0ze83ja/O437du6NQA33W5Y0O+ar3aKM=
|
||||
github.com/containerd/nri v0.12.1/go.mod h1:TGAfPLH4a+qwbv0PxsefPiR+PobYecDj2aXMtz7GQcg=
|
||||
github.com/containerd/otelttrpc v0.1.0 h1:UOX68eVTE8H/T45JveIg+I22Ev2aFj4qPITCmXsskjw=
|
||||
github.com/containerd/otelttrpc v0.1.0/go.mod h1:XhoA2VvaGPW1clB2ULwrBZfXVuEWuyOd2NUD1IM0yTg=
|
||||
github.com/containerd/platforms v1.0.0-rc.4 h1:M42JrUT4zfZTqtkUwkr0GzmUWbfyO5VO0Q5b3op97T4=
|
||||
|
||||
1
vendor/github.com/containerd/nri/.gitignore
generated
vendored
1
vendor/github.com/containerd/nri/.gitignore
generated
vendored
@@ -3,3 +3,4 @@
|
||||
|
||||
build/
|
||||
pkg/version/info/*
|
||||
!pkg/version/info/none
|
||||
|
||||
3
vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go
generated
vendored
3
vendor/github.com/containerd/nri/pkg/adaptation/adaptation.go
generated
vendored
@@ -479,9 +479,6 @@ func (r *Adaptation) RemoveContainer(ctx context.Context, req *RemoveContainerRe
|
||||
|
||||
// Perform a set of unsolicited container updates requested by a plugin.
|
||||
func (r *Adaptation) updateContainers(ctx context.Context, req []*ContainerUpdate) ([]*ContainerUpdate, error) {
|
||||
r.Lock()
|
||||
defer r.Unlock()
|
||||
|
||||
return r.updateFn(ctx, req)
|
||||
}
|
||||
|
||||
|
||||
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
@@ -190,7 +190,7 @@ github.com/containerd/imgcrypt/v2/images/encryption
|
||||
## explicit; go 1.20
|
||||
github.com/containerd/log
|
||||
github.com/containerd/log/logtest
|
||||
# github.com/containerd/nri v0.12.0
|
||||
# github.com/containerd/nri v0.12.1
|
||||
## explicit; go 1.24.0
|
||||
github.com/containerd/nri
|
||||
github.com/containerd/nri/pkg/adaptation
|
||||
|
||||
Reference in New Issue
Block a user