added a config option for enabling mTLS for Target Allocator

Signed-off-by: Praful Khanduri <holiodin@gmail.com>

Author: Horiodino

apis/v1alpha1/convert.go

@@ -174,6 +174,13 @@ func tov1beta1Ports(in []PortsSpec) []v1beta1.PortsSpec {
 }
 
 func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedded {
+	var mtls *v1beta1.TargetAllocatorMTLS
+	if in.Mtls != nil {
+		mtls = &v1beta1.TargetAllocatorMTLS{
+			Enabled: in.Mtls.Enabled,
+		}
+	}
+
 	return v1beta1.TargetAllocatorEmbedded{
 		Replicas:           in.Replicas,
 		NodeSelector:       in.NodeSelector,
@@ -208,6 +215,7 @@ func tov1beta1TA(in OpenTelemetryTargetAllocator) v1beta1.TargetAllocatorEmbedde
 			},
 		},
 		PodDisruptionBudget: tov1beta1PodDisruptionBudget(in.PodDisruptionBudget),
+		Mtls:                mtls,
 	}
 }
 
@@ -445,6 +453,12 @@ func tov1alpha1TA(in v1beta1.TargetAllocatorEmbedded) OpenTelemetryTargetAllocat
 	if in.PrometheusCR.ServiceMonitorSelector != nil {
 		serviceMonitorSelector = in.PrometheusCR.ServiceMonitorSelector.MatchLabels
 	}
+	var mtls *TargetAllocatorMTLS
+	if in.Mtls != nil {
+		mtls = &TargetAllocatorMTLS{
+			Enabled: in.Mtls.Enabled,
+		}
+	}
 
 	return OpenTelemetryTargetAllocator{
 		Replicas:           in.Replicas,
@@ -475,6 +489,7 @@ func tov1alpha1TA(in v1beta1.TargetAllocatorEmbedded) OpenTelemetryTargetAllocat
 			},
 		},
 		PodDisruptionBudget: tov1alpha1PodDisruptionBudget(in.PodDisruptionBudget),
+		Mtls:                mtls,
 	}
 }
 

apis/v1alpha1/opentelemetrycollector_types.go

@@ -381,6 +381,9 @@ type OpenTelemetryTargetAllocator struct {
 	//
 	// +optional
 	PodDisruptionBudget *PodDisruptionBudgetSpec `json:"podDisruptionBudget,omitempty"`
+
+	// Mtls defines the mTLS configuration for the target allocator. If enabled, the target allocator will communicate with the collector over mTLS.
+	Mtls *TargetAllocatorMTLS `json:"mtls,omitempty"`
 }
 
 type OpenTelemetryTargetAllocatorPrometheusCR struct {
@@ -613,3 +616,9 @@ type ConfigMapsSpec struct {
 	Name      string `json:"name"`
 	MountPath string `json:"mountpath"`
 }
+
+type TargetAllocatorMTLS struct {
+	// Enabled indicates whether to enable mTLS between the target allocator and the collector.
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
+}

apis/v1alpha1/targetallocator_types.go

@@ -93,6 +93,9 @@ type TargetAllocatorSpec struct {
 	// +kubebuilder:default:="30s"
 	// +kubebuilder:validation:Format:=duration
 	CollectorNotReadyGracePeriod *metav1.Duration `json:"collectorNotReadyGracePeriod,omitempty"`
+	// Mtls defines the mTLS configuration for the target allocator. If enabled, the target allocator will communicate with the collector over mTLS.
+	// +optional
+	Mtls *TargetAllocatorMTLS `json:"mtls,omitempty"`
 	// LivenessProbe defines the liveness probe configuration for the Target Allocator container.
 	// +optional
 	LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`

apis/v1alpha1/zz_generated.deepcopy.go

@@ -237,6 +237,16 @@ type TargetAllocatorEmbedded struct {
 	// +kubebuilder:default:="30s"
 	// +kubebuilder:validation:Format:=duration
 	CollectorTargetReloadInterval *metav1.Duration `json:"collectorTargetReloadInterval,omitempty"`
+
+	// Mtls defines the mTLS configuration for the target allocator. If enabled, the target allocator will communicate with the collector over mTLS.
+	// +optional
+	Mtls *TargetAllocatorMTLS `json:"mtls,omitempty"`
+}
+
+type TargetAllocatorMTLS struct {
+	// Enabled indicates whether to enable mTLS between the target allocator and the collector.
+	// +optional
+	Enabled bool `json:"enabled,omitempty"`
 }
 
 // Probe defines the OpenTelemetry's pod probe config.

apis/v1beta1/opentelemetrycollector_types.go

@@ -30,7 +30,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 var (
@@ -2853,6 +2852,9 @@ prometheus_cr:
 					},
 					Spec: v1alpha1.TargetAllocatorSpec{
 						FilterStrategy: v1beta1.TargetAllocatorFilterStrategyRelabelConfig,
+						Mtls: &v1alpha1.TargetAllocatorMTLS{
+							Enabled: true,
+						},
 						PrometheusCR: v1beta1.TargetAllocatorPrometheusCR{
 							Enabled: true,
 						},
@@ -3337,7 +3339,6 @@ prometheus_cr:
 				TargetAllocatorConfigMapEntry: "targetallocator.yaml",
 				CollectorConfigMapEntry:       "collector.yaml",
 			},
-			featuregates: []*colfeaturegate.Gate{featuregate.EnableTargetAllocatorMTLS},
 		},
 	}
 	for _, tt := range tests {

apis/v1beta1/zz_generated.deepcopy.go

@@ -35,7 +35,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
 	taStatus "github.com/open-telemetry/opentelemetry-operator/internal/status/targetallocator"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 // TargetAllocatorReconciler reconciles a TargetAllocator object.
@@ -199,7 +198,7 @@ func (r *TargetAllocatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
 		ctrlBuilder.Owns(&monitoringv1.PodMonitor{})
 	}
 
-	if r.config.CertManagerAvailability == certmanager.Available && featuregate.EnableTargetAllocatorMTLS.IsEnabled() {
+	if r.config.CertManagerAvailability == certmanager.Available {
 		ctrlBuilder.Owns(&cmv1.Certificate{})
 		ctrlBuilder.Owns(&cmv1.Issuer{})
 	}

internal/controllers/builder_test.go

@@ -16,7 +16,6 @@ import (
 	ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/constants"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
@@ -49,7 +48,10 @@ func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
 
 	replaceCfgOpts := []ta.TAOption{}
 
-	if otelCol.Spec.TargetAllocator.Enabled && params.Config.CertManagerAvailability == certmanager.Available && featuregate.EnableTargetAllocatorMTLS.IsEnabled() {
+	if otelCol.Spec.TargetAllocator.Enabled &&
+		otelCol.Spec.TargetAllocator.Mtls != nil &&
+		otelCol.Spec.TargetAllocator.Mtls.Enabled &&
+		params.Config.CertManagerAvailability == certmanager.Available {
 		replaceCfgOpts = append(replaceCfgOpts, ta.WithTLSConfig(
 			filepath.Join(constants.TACollectorTLSDirPath, constants.TACollectorCAFileName),
 			filepath.Join(constants.TACollectorTLSDirPath, constants.TACollectorTLSCertFileName),

internal/controllers/targetallocator_controller.go

@@ -8,15 +8,14 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	colfg "go.opentelemetry.io/collector/featuregate"
 
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/certmanager"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/openshift"
 	"github.com/open-telemetry/opentelemetry-operator/internal/autodetect/prometheus"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/manifestutils"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 func TestDesiredConfigMap(t *testing.T) {
@@ -150,9 +149,6 @@ service:
 			CertManagerAvailability:     certmanager.Available,
 		})
 		require.NoError(t, err)
-		flgs := featuregate.Flags(colfg.GlobalRegistry())
-		err = flgs.Parse([]string{"--feature-gates=operator.targetallocator.mtls"})
-		require.NoError(t, err)
 
 		hash, _ := manifestutils.GetConfigMapSHA(param.OtelCol.Spec.Config)
 		expectedName := naming.ConfigMap("test", hash)
@@ -162,6 +158,7 @@ service:
 		expectedLables["app.kubernetes.io/version"] = "latest"
 
 		param.OtelCol.Spec.TargetAllocator.Enabled = true
+		param.OtelCol.Spec.TargetAllocator.Mtls = &v1beta1.TargetAllocatorMTLS{Enabled: true}
 		actual, err := ConfigMap(param)
 
 		assert.NoError(t, err)
@@ -210,10 +207,7 @@ service:
 			CertManagerAvailability:     certmanager.Available,
 		})
 		require.NoError(t, err)
-		flgs := featuregate.Flags(colfg.GlobalRegistry())
-		err = flgs.Parse([]string{"--feature-gates=operator.targetallocator.mtls"})
 		param.TargetAllocator = nil
-		require.NoError(t, err)
 
 		hash, _ := manifestutils.GetConfigMapSHA(param.OtelCol.Spec.Config)
 		expectedName := naming.ConfigMap("test", hash)