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

Merge pull request #11529 from ningmingxiao/v2.0_fix

Browse Source 
[release/2.0] Fix incorrect runtime name being passed to NRI
This commit is contained in:
Derek McGowan
2025-03-13 23:58:57 +08:00
committed by GitHub
parent 5a3ac90a7a 4f037050ce
commit 76db0585af
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/nri/nri.go
View File

@@ -19,7 +19,6 @@ package nri
import ( import (
"context" "context"
"fmt" "fmt"
"path"
"sync" "sync"
"github.com/containerd/log" "github.com/containerd/log"
@@ -117,7 +116,7 @@ func New(cfg *Config) (API, error) {
} }
var ( var (
name = path.Base(version.Package) name = version.Name
version = version.Version version = version.Version
opts = cfg.toOptions() opts = cfg.toOptions()
syncFn = l.syncPlugin syncFn = l.syncPlugin

1
version/version.go
View File

@@ -19,6 +19,7 @@ package version
import "runtime" import "runtime"
var ( var (
Name = "containerd"
// Package is filled at linking time // Package is filled at linking time
Package = "github.com/containerd/containerd/v2" Package = "github.com/containerd/containerd/v2"