cri: call RegisterReadiness after NewCRIService

AkihiroSuda · AkihiroSuda · commit 5365f4b29e10 · 2023-09-29T23:06:36.000+09:00
`NewCRIService()` may easily fail and its error has to be ignored
unless the CRI plugin is in the `required_plugins` list.

Now this has to be called before `RegisterReadiness()`, as
PR 9153 "Require plugins to succeed after registering readiness"
was merged on 2023-09-29.

Fix issue 9163: `[Regression in main (2023-09-29)]: containerd-rootless.sh doesn't start up`

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go
@@ -54,7 +54,6 @@ func init() {
 }
 
 func initCRIService(ic *plugin.InitContext) (interface{}, error) {
-	ready := ic.RegisterReadiness()
 	ic.Meta.Platforms = []imagespec.Platform{platforms.DefaultSpec()}
 	ic.Meta.Exports = map[string]string{"CRIVersion": constants.CRIVersion}
 	ctx := ic.Context
@@ -99,6 +98,8 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {
 		return nil, fmt.Errorf("failed to create CRI service: %w", err)
 	}
 
+	// RegisterReadiness() must be called after NewCRIService(): https://github.com/containerd/containerd/issues/9163
+	ready := ic.RegisterReadiness()
 	go func() {
 		if err := s.Run(ready); err != nil {
 			log.G(ctx).WithError(err).Fatal("Failed to run CRI service")

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ func init() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`func initCRIService(ic *plugin.InitContext) (interface{}, error) {`
`57`		`- ready := ic.RegisterReadiness()`
`58`	`57`	`ic.Meta.Platforms = []imagespec.Platform{platforms.DefaultSpec()}`
`59`	`58`	`ic.Meta.Exports = map[string]string{"CRIVersion": constants.CRIVersion}`
`60`	`59`	`ctx := ic.Context`
`@@ -99,6 +98,8 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {`
`99`	`98`	`return nil, fmt.Errorf("failed to create CRI service: %w", err)`
`100`	`99`	`}`
`101`	`100`
	`101`	`+ // RegisterReadiness() must be called after NewCRIService(): https://github.com/containerd/containerd/issues/9163`
	`102`	`+ ready := ic.RegisterReadiness()`
`102`	`103`	`go func() {`
`103`	`104`	`if err := s.Run(ready); err != nil {`
`104`	`105`	`log.G(ctx).WithError(err).Fatal("Failed to run CRI service")`