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

Merge pull request #10401 from samuelkarp/nri-panic

Browse Source 
cri: ensure NRI API never has nil CRI
This commit is contained in:
Samuel Karp 2024-07-01 16:37:46 +00:00 committed by GitHub
commit ebcbbe5643
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/cri/nri/nri_api_linux.go
View File

@ -46,9 +46,10 @@ type API struct {
nri nri.API nri nri.API
} }
func NewAPI(nri nri.API) *API { func NewAPI(nri nri.API, cri CRIImplementation) *API {
return &API{ return &API{
nri: nri, nri: nri,
cri: cri,
} }
} }
@ -58,12 +59,11 @@ func (a *API) IsDisabled() bool {
func (a *API) IsEnabled() bool { return !a.IsDisabled() } func (a *API) IsEnabled() bool { return !a.IsDisabled() }
func (a *API) Register(cri CRIImplementation) error { func (a *API) Register() error {
if a.IsDisabled() { if a.IsDisabled() {
return nil return nil
} }
a.cri = cri
nri.RegisterDomain(a) nri.RegisterDomain(a)
return a.nri.Start() return a.nri.Start()

4
internal/cri/nri/nri_api_other.go
View File

@ -37,11 +37,11 @@ import (
type API struct { type API struct {
} }
func NewAPI(nri.API) *API { func NewAPI(nri.API, CRIImplementation) *API {
return nil return nil
} }
func (a *API) Register(CRIImplementation) error { func (a *API) Register() error {
return nil return nil
} }

8
internal/cri/server/service.go
View File

@ -35,6 +35,7 @@ import (
"k8s.io/kubelet/pkg/cri/streaming" "k8s.io/kubelet/pkg/cri/streaming"
apitypes "github.com/containerd/containerd/api/types" apitypes "github.com/containerd/containerd/api/types"
containerd "github.com/containerd/containerd/v2/client" containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/core/introspection" "github.com/containerd/containerd/v2/core/introspection"
_ "github.com/containerd/containerd/v2/core/runtime" // for typeurl init _ "github.com/containerd/containerd/v2/core/runtime" // for typeurl init
@ -50,6 +51,7 @@ import (
snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot" snapshotstore "github.com/containerd/containerd/v2/internal/cri/store/snapshot"
ctrdutil "github.com/containerd/containerd/v2/internal/cri/util" ctrdutil "github.com/containerd/containerd/v2/internal/cri/util"
"github.com/containerd/containerd/v2/internal/eventq" "github.com/containerd/containerd/v2/internal/eventq"
nriservice "github.com/containerd/containerd/v2/internal/nri"
"github.com/containerd/containerd/v2/internal/registrar" "github.com/containerd/containerd/v2/internal/registrar"
"github.com/containerd/containerd/v2/pkg/oci" "github.com/containerd/containerd/v2/pkg/oci"
osinterface "github.com/containerd/containerd/v2/pkg/os" osinterface "github.com/containerd/containerd/v2/pkg/os"
@ -164,7 +166,7 @@ type CRIServiceOptions struct {
StreamingConfig streaming.Config StreamingConfig streaming.Config
NRI *nri.API NRI nriservice.API
// SandboxControllers is a map of all the loaded sandbox controllers // SandboxControllers is a map of all the loaded sandbox controllers
SandboxControllers map[string]sandbox.Controller SandboxControllers map[string]sandbox.Controller
@ -236,7 +238,7 @@ func NewCRIService(options *CRIServiceOptions) (CRIService, runtime.RuntimeServi
} }
} }
c.nri = options.NRI c.nri = nri.NewAPI(options.NRI, &criImplementation{c})
c.runtimeHandlers, err = c.introspectRuntimeHandlers(ctx) c.runtimeHandlers, err = c.introspectRuntimeHandlers(ctx)
if err != nil { if err != nil {
@ -297,7 +299,7 @@ func (c *criService) Run(ready func()) error {
}() }()
// register CRI domain with NRI // register CRI domain with NRI
if err := c.nri.Register(&criImplementation{c}); err != nil { if err := c.nri.Register(); err != nil {
return fmt.Errorf("failed to set up NRI for CRI service: %w", err) return fmt.Errorf("failed to set up NRI for CRI service: %w", err)
} }

2
internal/nri/nri.go
View File

@ -38,7 +38,7 @@ type API interface {
// IsEnabled returns true if the NRI interface is enabled and initialized. // IsEnabled returns true if the NRI interface is enabled and initialized.
IsEnabled() bool IsEnabled() bool
// Start start the NRI interface, allowing external NRI plugins to // Start starts the NRI interface, allowing external NRI plugins to
// connect, register, and hook themselves into the lifecycle events // connect, register, and hook themselves into the lifecycle events
// of pods and containers. // of pods and containers.
Start() error Start() error

6
plugins/cri/cri.go
View File

@ -32,7 +32,6 @@ import (
criconfig "github.com/containerd/containerd/v2/internal/cri/config" criconfig "github.com/containerd/containerd/v2/internal/cri/config"
"github.com/containerd/containerd/v2/internal/cri/constants" "github.com/containerd/containerd/v2/internal/cri/constants"
"github.com/containerd/containerd/v2/internal/cri/instrument" "github.com/containerd/containerd/v2/internal/cri/instrument"
"github.com/containerd/containerd/v2/internal/cri/nri"
"github.com/containerd/containerd/v2/internal/cri/server" "github.com/containerd/containerd/v2/internal/cri/server"
nriservice "github.com/containerd/containerd/v2/internal/nri" nriservice "github.com/containerd/containerd/v2/internal/nri"
"github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/plugins"
@ -212,7 +211,7 @@ func (c criGRPCServerWithTCP) RegisterTCP(s *grpc.Server) error {
} }
// Get the NRI plugin, and set up our NRI API for it. // Get the NRI plugin, and set up our NRI API for it.
func getNRIAPI(ic *plugin.InitContext) *nri.API { func getNRIAPI(ic *plugin.InitContext) nriservice.API {
const ( const (
pluginType = plugins.NRIApiPlugin pluginType = plugins.NRIApiPlugin
pluginName = "nri" pluginName = "nri"
@ -234,8 +233,7 @@ func getNRIAPI(ic *plugin.InitContext) *nri.API {
} }
log.G(ctx).Info("using experimental NRI integration - disable nri plugin to prevent this") log.G(ctx).Info("using experimental NRI integration - disable nri plugin to prevent this")
return api
return nri.NewAPI(api)
} }
func getSandboxControllers(ic *plugin.InitContext) (map[string]sandbox.Controller, error) { func getSandboxControllers(ic *plugin.InitContext) (map[string]sandbox.Controller, error) {