Merge pull request #11426 from Nordix/lentzi90/fix-runtime-client-nil-check

k8s-ci-robot · web-flow · commit ceab066d59df · 2024-11-15T09:18:53.000Z
🐛 Fix RuntimeClient nil check in Cluster controller
diff --git a/internal/controllers/topology/cluster/cluster_controller.go b/internal/controllers/topology/cluster/cluster_controller.go
@@ -94,8 +94,12 @@ type Reconciler struct {
 }
 
 func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
-	if r.Client == nil || r.APIReader == nil || r.ClusterCache == nil || r.RuntimeClient == nil {
-		return errors.New("Client, APIReader, ClusterCache and RuntimeClient must not be nil")
+	if r.Client == nil || r.APIReader == nil || r.ClusterCache == nil {
+		return errors.New("Client, APIReader and ClusterCache must not be nil")
+	}
+
+	if feature.Gates.Enabled(feature.RuntimeSDK) && r.RuntimeClient == nil {
+		return errors.New("RuntimeClient must not be nil")
 	}
 
 	r.predicateLog = ctrl.LoggerFrom(ctx).WithValues("controller", "topology/cluster")

Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,12 @@ type Reconciler struct {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {`
`97`		`- if r.Client == nil \|\| r.APIReader == nil \|\| r.ClusterCache == nil \|\| r.RuntimeClient == nil {`
`98`		`- return errors.New("Client, APIReader, ClusterCache and RuntimeClient must not be nil")`
	`97`	`+ if r.Client == nil \|\| r.APIReader == nil \|\| r.ClusterCache == nil {`
	`98`	`+ return errors.New("Client, APIReader and ClusterCache must not be nil")`
	`99`	`+ }`
	`100`	`+`
	`101`	`+ if feature.Gates.Enabled(feature.RuntimeSDK) && r.RuntimeClient == nil {`
	`102`	`+ return errors.New("RuntimeClient must not be nil")`
`99`	`103`	`}`
`100`	`104`
`101`	`105`	`r.predicateLog = ctrl.LoggerFrom(ctx).WithValues("controller", "topology/cluster")`