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

dmcgowan · web-flow · commit 76db0585afdc · 2025-03-13T23:58:57.000+08:00
[release/2.0] Fix incorrect runtime name being passed to NRI
diff --git a/internal/nri/nri.go b/internal/nri/nri.go
@@ -19,7 +19,6 @@ package nri
 import (
 	"context"
 	"fmt"
-	"path"
 	"sync"
 
 	"github.com/containerd/log"
@@ -117,7 +116,7 @@ func New(cfg *Config) (API, error) {
 	}
 
 	var (
-		name     = path.Base(version.Package)
+		name     = version.Name
 		version  = version.Version
 		opts     = cfg.toOptions()
 		syncFn   = l.syncPlugin
diff --git a/version/version.go b/version/version.go
@@ -19,6 +19,7 @@ package version
 import "runtime"
 
 var (
+	Name = "containerd"
 	// Package is filled at linking time
 	Package = "github.com/containerd/containerd/v2"
 
