Remove the operator.collector.targetallocatorcr feature flag (#4449)

Author: swiatekm

.chloggen/feat_drop-feature-flag-ta.yaml

@@ -0,0 +1,17 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: target allocator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove the operator.collector.targetallocatorcr feature flag
+
+# One or more tracking issues related to the change
+issues: [2422]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: This behavior has been enabled by default since version 0.127.0.
+

internal/controllers/common.go

@@ -24,7 +24,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/opampbridge"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 func isNamespaceScoped(obj client.Object) bool {
@@ -49,27 +48,6 @@ func BuildCollector(params manifests.Params) ([]client.Object, error) {
 		}
 		resources = append(resources, objs...)
 	}
-	// If we're not building a TargetAllocator CRD, then we need to separately invoke its builder
-	// to directly build the manifests. This is what used to happen before the TargetAllocator CRD
-	// was introduced.
-	if !featuregate.CollectorUsesTargetAllocatorCR.IsEnabled() {
-		if params.TargetAllocator != nil {
-			taParams := targetallocator.Params{
-				Client:          params.Client,
-				Scheme:          params.Scheme,
-				Recorder:        params.Recorder,
-				Log:             params.Log,
-				Config:          params.Config,
-				Collector:       &params.OtelCol,
-				TargetAllocator: *params.TargetAllocator,
-			}
-			taResources, err := BuildTargetAllocator(taParams)
-			if err != nil {
-				return nil, err
-			}
-			resources = append(resources, taResources...)
-		}
-	}
 	return resources, nil
 }
 

internal/controllers/opentelemetrycollector_controller.go

@@ -43,7 +43,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 const resourceOwnerKey = ".metadata.owner"
@@ -97,10 +96,6 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
 		switch objectType.(type) {
 		case *corev1.ConfigMap:
 			for _, object := range objs {
-				if !featuregate.CollectorUsesTargetAllocatorCR.IsEnabled() && object.GetLabels()["app.kubernetes.io/component"] != "opentelemetry-collector" {
-					// we only apply this to collector ConfigMaps
-					continue
-				}
 				configMap := object.(*corev1.ConfigMap)
 				collectorConfigMaps = append(collectorConfigMaps, configMap)
 			}
@@ -367,6 +362,7 @@ func (r *OpenTelemetryCollectorReconciler) GetOwnedResourceTypes() []client.Obje
 		&networkingv1.NetworkPolicy{},
 		&autoscalingv2.HorizontalPodAutoscaler{},
 		&policyV1.PodDisruptionBudget{},
+		&v1alpha1.TargetAllocator{},
 	}
 
 	if r.config.CreateRBACPermissions == rbac.Available {
@@ -383,10 +379,6 @@ func (r *OpenTelemetryCollectorReconciler) GetOwnedResourceTypes() []client.Obje
 		ownedResources = append(ownedResources, &routev1.Route{})
 	}
 
-	if featuregate.CollectorUsesTargetAllocatorCR.IsEnabled() {
-		ownedResources = append(ownedResources, &v1alpha1.TargetAllocator{})
-	}
-
 	return ownedResources
 }
 

internal/manifests/collector/collector.go

@@ -12,7 +12,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/rbac"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 const (
@@ -45,12 +44,9 @@ func Build(params manifests.Params) ([]client.Object, error) {
 		manifests.Factory(ExtensionService),
 		manifests.Factory(Ingress),
 		manifests.Factory(NetworkPolicy),
+		manifests.Factory(TargetAllocator),
 	}...)
 
-	if featuregate.CollectorUsesTargetAllocatorCR.IsEnabled() {
-		manifestFactories = append(manifestFactories, manifests.Factory(TargetAllocator))
-	}
-
 	if params.OtelCol.Spec.Observability.Metrics.EnableMetrics {
 		if params.OtelCol.Spec.Mode == v1beta1.ModeSidecar {
 			manifestFactories = append(manifestFactories, manifests.Factory(PodMonitor))

pkg/featuregate/featuregate.go

@@ -14,15 +14,6 @@ const (
 )
 
 var (
-	// CollectorUsesTargetAllocatorCR is the feature gate that enables the OpenTelemetryCollector reconciler to generate
-	// TargetAllocator CRs instead of generating the manifests for its resources directly.
-	CollectorUsesTargetAllocatorCR = featuregate.GlobalRegistry().MustRegister(
-		"operator.collector.targetallocatorcr",
-		featuregate.StageStable,
-		featuregate.WithRegisterDescription("causes collector reconciliation to create a target allocator CR instead of creating resources directly"),
-		featuregate.WithRegisterFromVersion("v0.112.0"),
-		featuregate.WithRegisterToVersion("v0.138.0"),
-	)
 	// EnableNativeSidecarContainers is the feature gate that controls whether a
 	// sidecar should be injected as a native sidecar or the classic way.
 	// Native sidecar containers have been available since kubernetes v1.28 in