diff --git a/go.mod b/go.mod index b7a8aa29f..4423a9354 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/containerd/go-runc v1.1.0 github.com/containerd/imgcrypt v1.2.0-rc1 github.com/containerd/log v0.1.0 - github.com/containerd/nri v0.6.2-0.20241010080438-159f5754db39 + github.com/containerd/nri v0.7.0 github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 github.com/containerd/platforms v0.2.1 github.com/containerd/plugin v0.1.0 diff --git a/go.sum b/go.sum index 684a14f28..56248c2e6 100644 --- a/go.sum +++ b/go.sum @@ -687,8 +687,8 @@ github.com/containerd/imgcrypt v1.2.0-rc1 h1:XESaAcMqxrGlRjQIqLdzxqsO/ddNK4vwfe7 github.com/containerd/imgcrypt v1.2.0-rc1/go.mod h1:F9roK2DzKlFnV+h+ZJy/r2FoS28bIvxKgdcoV7o8Sms= 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.6.2-0.20241010080438-159f5754db39 h1:M2Cz4Bm2++xdq0A/zWqunOjnp0HNYQnNDNSSzqCmqnE= -github.com/containerd/nri v0.6.2-0.20241010080438-159f5754db39/go.mod h1:uSkgBrCdEtAiEz4vnrq8gmAC4EnVAM5Klt0OuK5rZYQ= +github.com/containerd/nri v0.7.0 h1:scGL9JiBqNaWnghLFFPOzp0GxxWAc1uQtQ7qx8PHdCs= +github.com/containerd/nri v0.7.0/go.mod h1:uSkgBrCdEtAiEz4vnrq8gmAC4EnVAM5Klt0OuK5rZYQ= github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723 h1:swk9KxrmARZjSMrHc1Lzb39XhcDwAhYpqkBhinCFLCQ= github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723/go.mod h1:ZKzztepTSz/LKtbUSzfBNVwgqBEPABVZV9PQF/l53+Q= github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= diff --git a/vendor/github.com/containerd/nri/pkg/runtime-tools/generate/generate.go b/vendor/github.com/containerd/nri/pkg/runtime-tools/generate/generate.go index 40ed98fa8..cd2bc2878 100644 --- a/vendor/github.com/containerd/nri/pkg/runtime-tools/generate/generate.go +++ b/vendor/github.com/containerd/nri/pkg/runtime-tools/generate/generate.go @@ -329,9 +329,6 @@ func (g *Generator) AdjustCgroupsPath(path string) { func (g *Generator) AdjustOomScoreAdj(score *nri.OptionalInt) { if score != nil { g.SetProcessOOMScoreAdj(int(score.Value)) - } else { - g.SetProcessOOMScoreAdj(0) - g.Config.Process.OOMScoreAdj = nil } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 05c1dca1e..a2775eea3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -171,7 +171,7 @@ github.com/containerd/imgcrypt/images/encryption ## explicit; go 1.20 github.com/containerd/log github.com/containerd/log/logtest -# github.com/containerd/nri v0.6.2-0.20241010080438-159f5754db39 +# github.com/containerd/nri v0.7.0 ## explicit; go 1.21 github.com/containerd/nri github.com/containerd/nri/pkg/adaptation