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

🐛 Fix RuntimeClient nil check in ClusterClass controller
kubernetes-sigs · Oct 30, 2024 · e75b4e7 · e75b4e7
2 parents f8a2970 + 7bde377
commit e75b4e7
Showing 1 changed file with 5 additions and 2 deletions.
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")