Merge pull request #11350 from sbueringer/pr-fix-client-client

k8s-ci-robot · web-flow · commit e75b4e7b768b · 2024-10-30T02:53:25.000Z
🐛 Fix RuntimeClient nil check in ClusterClass controller
diff --git a/internal/controllers/clusterclass/clusterclass_controller.go b/internal/controllers/clusterclass/clusterclass_controller.go
@@ -71,8 +71,11 @@ type Reconciler struct {
 }
 
 func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
-	if r.Client == nil || r.RuntimeClient == nil {
-		return errors.New("Client and RuntimeClient must not be nil")
+	if r.Client == nil {
+		return errors.New("Client must not be nil")
+	}
+	if feature.Gates.Enabled(feature.RuntimeSDK) && r.RuntimeClient == nil {
+		return errors.New("RuntimeClient must not be nil")
 	}
 
 	predicateLog := ctrl.LoggerFrom(ctx).WithValues("controller", "clusterclass")

Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,11 @@ type Reconciler struct {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {`
`74`		`- if r.Client == nil \|\| r.RuntimeClient == nil {`
`75`		`- return errors.New("Client and RuntimeClient must not be nil")`
	`74`	`+ if r.Client == nil {`
	`75`	`+ return errors.New("Client must not be nil")`
	`76`	`+ }`
	`77`	`+ if feature.Gates.Enabled(feature.RuntimeSDK) && r.RuntimeClient == nil {`
	`78`	`+ return errors.New("RuntimeClient must not be nil")`
`76`	`79`	`}`
`77`	`80`
`78`	`81`	`predicateLog := ctrl.LoggerFrom(ctx).WithValues("controller", "clusterclass")`