Review suggestions

Author: khewonc

cmd/main.go

@@ -341,7 +341,7 @@ func run(opts *options) error {
 			}
 
 			if opts.remoteUpdatesEnabled {
-				if rcErr := setupFleetDaemon(setupLog, mgr, rcUpdater.Client()); rcErr != nil {
+				if rcErr := setupFleetDaemon(setupLog, mgr, rcUpdater.Client(), opts.createControllerRevisions && opts.datadogAgentInternalEnabled); rcErr != nil {
 					setupErrorf(setupLog, rcErr, "Unable to setup Fleet daemon")
 				}
 			}
@@ -665,7 +665,7 @@ func setupAndStartHelmMetadataForwarder(logger logr.Logger, mgr manager.Manager,
 	return mgr.Add(hmf)
 }
 
-func setupFleetDaemon(logger logr.Logger, mgr manager.Manager, rcClient remoteconfig.RCClient) error {
-	daemon := fleet.NewDaemon(rcClient, mgr.GetClient())
+func setupFleetDaemon(logger logr.Logger, mgr manager.Manager, rcClient remoteconfig.RCClient, revisionsEnabled bool) error {
+	daemon := fleet.NewDaemon(rcClient, mgr.GetClient(), revisionsEnabled)
 	return mgr.Add(daemon)
 }

internal/controller/datadogagent/experiment.go

@@ -159,6 +159,9 @@ func (r *Reconciler) rollback(
 	// Merge snapshot annotations (Datadog-only keys) on top of current annotations
 	// so that non-Datadog annotations (user metadata, tooling labels, etc.) are preserved.
 	merged := maps.Clone(current.Annotations)
+	if merged == nil {
+		merged = make(map[string]string, len(snapshot.Annotations))
+	}
 	maps.Copy(merged, snapshot.Annotations)
 
 	toUpdate := &v2alpha1.DatadogAgent{

pkg/fleet/daemon.go

@@ -32,18 +32,22 @@ var _ manager.LeaderElectionRunnable = &Daemon{}
 // Daemon subscribes to fleet-specific RC products (installer configs and tasks)
 // and runs after leader election as a controller-runtime Runnable.
 type Daemon struct {
-	rcClient remoteconfig.RCClient
-	client   client.Client
-	mu       sync.RWMutex
-	configs  map[string]installerConfig // keyed by config ID; replaced on each RC update
+	rcClient          remoteconfig.RCClient
+	client            client.Client
+	revisionsEnabled  bool
+	mu                sync.RWMutex
+	configs           map[string]installerConfig // keyed by config ID; replaced on each RC update
 }
 
-// NewDaemon creates a new Fleet Daemon.
-func NewDaemon(rcClient remoteconfig.RCClient, k8sClient client.Client) *Daemon {
+// NewDaemon creates a new Fleet Daemon. When revisionsEnabled is false, experiment
+// signals are rejected because the reconciler cannot process them without the
+// ControllerRevision machinery.
+func NewDaemon(rcClient remoteconfig.RCClient, k8sClient client.Client, revisionsEnabled bool) *Daemon {
 	return &Daemon{
-		rcClient: rcClient,
-		client:   k8sClient,
-		configs:  make(map[string]installerConfig),
+		rcClient:         rcClient,
+		client:           k8sClient,
+		revisionsEnabled: revisionsEnabled,
+		configs:          make(map[string]installerConfig),
 	}
 }
 
@@ -101,6 +105,11 @@ func (d *Daemon) getConfig(id string) (installerConfig, error) {
 // handleRemoteAPIRequest dispatches the incoming task to the appropriate handler.
 func (d *Daemon) handleRemoteAPIRequest(ctx context.Context, req remoteAPIRequest) error {
 	ctrl.LoggerFrom(ctx).Info("Received remote API request", "id", req.ID, "package", req.Package, "method", req.Method)
+
+	if !d.revisionsEnabled {
+		return fmt.Errorf("experiment signals require the CreateControllerRevisions and DatadogAgentInternal feature gates")
+	}
+
 	switch req.Method {
 	case methodStartDatadogAgentExperiment:
 		return d.startDatadogAgentExperiment(ctx, req)

pkg/fleet/daemon_test.go

@@ -38,8 +38,9 @@ func testDaemon(dda *v2alpha1.DatadogAgent, configs map[string]installerConfig)
 	}
 	c := b.Build()
 	return &Daemon{
-		client:  c,
-		configs: configs,
+		client:           c,
+		revisionsEnabled: true,
+		configs:          configs,
 	}, c
 }