Migrate four controllers to per-controller condition reporting

Migrate CoreCluster, InfraCluster, Kubeconfig, and SecretSync controllers
from ClusterOperatorStatusClient (merge-patch, shared top-level conditions)
to ControllerResultGenerator (server-side apply, per-controller prefixed
conditions).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: stefanonardo

cmd/capi-controllers/main.go

@@ -172,35 +172,37 @@ func setupPlatformReconcilers(log logr.Logger, mgr manager.Manager, operatorConf
 
 func setupReconcilers(mgr manager.Manager, operatorConfig commoncmdoptions.OperatorConfig, infra *configv1.Infrastructure, platform configv1.PlatformType, infraClusterObject client.Object) error {
 	if err := (&corecluster.CoreClusterController{
-		ClusterOperatorStatusClient: operatorConfig.GetClusterOperatorStatusClient(mgr, platform, "cluster-resource"),
-		Cluster:                     &clusterv1.Cluster{},
-		Platform:                    platform,
-		Infra:                       infra,
+		Client:           mgr.GetClient(),
+		ManagedNamespace: *operatorConfig.CAPINamespace,
+		Cluster:          &clusterv1.Cluster{},
+		Platform:         platform,
+		Infra:            infra,
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to create corecluster controller: %w", err)
 	}
 
 	if err := (&secretsync.UserDataSecretController{
-		ClusterOperatorStatusClient: operatorConfig.GetClusterOperatorStatusClient(mgr, platform, "user-data-secret"),
-		Scheme:                      mgr.GetScheme(),
+		Client:           mgr.GetClient(),
+		ManagedNamespace: *operatorConfig.CAPINamespace,
+		Scheme:           mgr.GetScheme(),
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to create user-data-secret controller: %w", err)
 	}
 
 	if err := (&kubeconfig.KubeconfigReconciler{
-		ClusterOperatorStatusClient: operatorConfig.GetClusterOperatorStatusClient(mgr, platform, "kubeconfig"),
-		Scheme:                      mgr.GetScheme(),
-		RestCfg:                     mgr.GetConfig(),
+		Client:  mgr.GetClient(),
+		Scheme:  mgr.GetScheme(),
+		RestCfg: mgr.GetConfig(),
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to create kubeconfig controller: %w", err)
 	}
 
 	if err := (&infracluster.InfraClusterController{
-		ClusterOperatorStatusClient: operatorConfig.GetClusterOperatorStatusClient(mgr, platform, "infracluster"),
-		Scheme:                      mgr.GetScheme(),
-		RestCfg:                     mgr.GetConfig(),
-		Platform:                    platform,
-		Infra:                       infra,
+		Client:   mgr.GetClient(),
+		Scheme:   mgr.GetScheme(),
+		RestCfg:  mgr.GetConfig(),
+		Platform: platform,
+		Infra:    infra,
 	}).SetupWithManager(mgr, infraClusterObject); err != nil {
 		return fmt.Errorf("unable to create infracluster controller: %w", err)
 	}

pkg/commoncmdoptions/commonoptions.go

@@ -39,12 +39,9 @@ import (
 	"k8s.io/klog/v2"
 	"k8s.io/klog/v2/textlogger"
 
-	configv1 "github.com/openshift/api/config/v1"
 	libgocrypto "github.com/openshift/library-go/pkg/crypto"
 
 	"github.com/openshift/cluster-capi-operator/pkg/controllers"
-	"github.com/openshift/cluster-capi-operator/pkg/operatorstatus"
-	"github.com/openshift/cluster-capi-operator/pkg/util"
 )
 
 // The default durations for the leader election operations.
@@ -179,19 +176,6 @@ func InitOperatorConfig(ctx context.Context, cfg *rest.Config, scheme *runtime.S
 	}, initManager(cfg, setupSecurityProfileWatcher), nil
 }
 
-// GetClusterOperatorStatusClient returns a ClusterOperatorStatusClient struct which has been
-// initialised with values from the command line.
-func (opts *OperatorConfig) GetClusterOperatorStatusClient(mgr ctrl.Manager, platform configv1.PlatformType, controllerName string) operatorstatus.ClusterOperatorStatusClient {
-	return operatorstatus.ClusterOperatorStatusClient{
-		Client:            mgr.GetClient(),
-		Recorder:          mgr.GetEventRecorderFor(opts.managerName + "-" + controllerName),
-		ReleaseVersion:    util.GetReleaseVersion(),
-		ManagedNamespace:  *opts.CAPINamespace,
-		OperatorNamespace: *opts.OperatorNamespace,
-		Platform:          platform,
-	}
-}
-
 func initManager(cfg *rest.Config, securityProfileWatcher func(ctrl.Manager, context.CancelFunc) error) func(ctx context.Context, cancel context.CancelFunc, mgrOpts ctrl.Options) (ctrl.Manager, error) {
 	return func(ctx context.Context, cancel context.CancelFunc, mgrOpts ctrl.Options) (ctrl.Manager, error) {
 		mgr, err := ctrl.NewManager(cfg, mgrOpts)

pkg/controllers/clusteroperator/clusteroperator_controller.go

@@ -29,8 +29,12 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	configv1apply "github.com/openshift/client-go/config/applyconfigurations/config/v1"
 	"github.com/openshift/cluster-capi-operator/pkg/controllers"
+	"github.com/openshift/cluster-capi-operator/pkg/controllers/corecluster"
+	"github.com/openshift/cluster-capi-operator/pkg/controllers/infracluster"
 	"github.com/openshift/cluster-capi-operator/pkg/controllers/installer"
+	"github.com/openshift/cluster-capi-operator/pkg/controllers/kubeconfig"
 	"github.com/openshift/cluster-capi-operator/pkg/controllers/revision"
+	"github.com/openshift/cluster-capi-operator/pkg/controllers/secretsync"
 	"github.com/openshift/cluster-capi-operator/pkg/operatorstatus"
 	"github.com/openshift/cluster-capi-operator/pkg/util"
 )
@@ -175,11 +179,10 @@ func (r *ClusterOperatorController) aggregatedStatus(currentConditions []configv
 	subControllers := []operatorstatus.ControllerResultGenerator{
 		installer.ResultGenerator,
 		revision.ResultGenerator,
-		// TBD as they are migrated:
-		// - corecluster
-		// - infracluster
-		// - secretsync
-		// - kubeconfig
+		corecluster.ResultGenerator,
+		infracluster.ResultGenerator,
+		kubeconfig.ResultGenerator,
+		secretsync.ResultGenerator,
 	}
 
 	subcontrollerStatuses := util.SliceMap(subControllers, func(subController operatorstatus.ControllerResultGenerator) subcontrollerStatus {