cri: call RegisterReadiness after NewCRIService

AkihiroSuda · dmcgowan · commit 8f5eba3148d9 · 2023-10-09T15:59:59.000-07: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 <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 5365f4b) Signed-off-by: Derek McGowan <derek@mcg.dev>
diff --git a/pkg/cri/cri.go b/pkg/cri/cri.go
@@ -59,7 +59,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, "CRIVersionAlpha": constants.CRIVersionAlpha}
 	ctx := ic.Context
@@ -102,6 +101,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
`@@ -59,7 +59,6 @@ func init() {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func initCRIService(ic *plugin.InitContext) (interface{}, error) {`
`62`		`- ready := ic.RegisterReadiness()`
`63`	`62`	`ic.Meta.Platforms = []imagespec.Platform{platforms.DefaultSpec()}`
`64`	`63`	`ic.Meta.Exports = map[string]string{"CRIVersion": constants.CRIVersion, "CRIVersionAlpha": constants.CRIVersionAlpha}`
`65`	`64`	`ctx := ic.Context`
`@@ -102,6 +101,8 @@ func initCRIService(ic *plugin.InitContext) (interface{}, error) {`
`102`	`101`	`return nil, fmt.Errorf("failed to create CRI service: %w", err)`
`103`	`102`	`}`
`104`	`103`
	`104`	`+ // RegisterReadiness() must be called after NewCRIService(): https://github.com/containerd/containerd/issues/9163`
	`105`	`+ ready := ic.RegisterReadiness()`
`105`	`106`	`go func() {`
`106`	`107`	`if err := s.Run(ready); err != nil {`
`107`	`108`	`log.G(ctx).WithError(err).Fatal("Failed to run CRI service")`