Added validation in webhook to validate prometheus config

api/v1alpha1/opentelemetrycollector_webhook.go

@@ -21,6 +21,8 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
+	ta "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator/adapters"
 )
 
 // log is for logging in this package.
@@ -96,5 +98,13 @@ func (r *OpenTelemetryCollector) validateCRDSpec() error {
 		return fmt.Errorf("the OpenTelemetry Collector mode is set to %s, which does not support the target allocation deployment", r.Spec.Mode)
 	}
 
+	// validate Prometheus config for target allocation
+	if r.Spec.TargetAllocator.Enabled {
+		_, err := ta.ConfigToPromConfig(r.Spec.Config)
+		if err != nil {
+			return fmt.Errorf("the OpenTelemetry Spec configuration is incorrect, %s", err)
+		}
+	}
+
 	return nil
 }

pkg/collector/reconcile/configmap.go

@@ -30,6 +30,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/naming"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator"
+	ta "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator/adapters"
 )
 
 // +kubebuilder:rbac:groups="",resources=configmaps,verbs=get;list;watch;create;update;patch;delete
@@ -84,7 +85,7 @@ func desiredTAConfigMap(params Params) (corev1.ConfigMap, error) {
 	labels := targetallocator.Labels(params.Instance)
 	labels["app.kubernetes.io/name"] = name
 
-	promConfig, err := GetPromConfig(params)
+	promConfig, err := ta.ConfigToPromConfig(params.Instance.Spec.Config)
 	if err != nil {
 		return corev1.ConfigMap{}, err
 	}

pkg/collector/reconcile/configmap_test.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-operator/api/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters"
 	ta "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator/adapters"
 )
 
@@ -210,10 +209,7 @@ func TestExpectedConfigMap(t *testing.T) {
 		assert.True(t, exists)
 		assert.Equal(t, instanceUID, actual.OwnerReferences[0].UID)
 
-		config, err := adapters.ConfigFromString(params().Instance.Spec.Config)
-		assert.NoError(t, err)
-
-		parmConfig, err := ta.ConfigToPromConfig(config)
+		parmConfig, err := ta.ConfigToPromConfig(params().Instance.Spec.Config)
 		assert.NoError(t, err)
 
 		taConfig := make(map[interface{}]interface{})

pkg/collector/reconcile/deployment.go

@@ -38,10 +38,6 @@ func Deployments(ctx context.Context, params Params) error {
 	}
 
 	if params.Instance.Spec.TargetAllocator.Enabled {
-		_, err := GetPromConfig(params)
-		if err != nil {
-			return fmt.Errorf("failed to parse Prometheus config: %v", err)
-		}
 		desired = append(desired, targetallocator.Deployment(params.Config, params.Log, params.Instance))
 	}
 

pkg/collector/reconcile/service.go

@@ -51,10 +51,6 @@ func Services(ctx context.Context, params Params) error {
 	}
 
 	if params.Instance.Spec.TargetAllocator.Enabled {
-		_, err := GetPromConfig(params)
-		if err != nil {
-			return fmt.Errorf("failed to parse Prometheus config: %v", err)
-		}
 		desired = append(desired, desiredTAService(params))
 	}
 

pkg/targetallocator/adapters/config_to_prom_config.go

@@ -16,6 +16,8 @@ package adapters
 
 import (
 	"fmt"
+
+	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters"
 )
 
 func errorNoComponent(component string) error {
@@ -27,7 +29,12 @@ func errorNotAMap(component string) error {
 }
 
 // ConfigToPromConfig converts the incoming configuration object into a the Prometheus receiver config.
-func ConfigToPromConfig(config map[interface{}]interface{}) (map[interface{}]interface{}, error) {
+func ConfigToPromConfig(cfg string) (map[interface{}]interface{}, error) {
+	config, err := adapters.ConfigFromString(cfg)
+	if err != nil {
+		return nil, err
+	}
+
 	receiversProperty, ok := config["receivers"]
 	if !ok {
 		return nil, errorNoComponent("receivers")

pkg/targetallocator/adapters/config_to_prom_config_test.go

@@ -20,9 +20,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 
-	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/adapters"
 	ta "github.com/open-telemetry/opentelemetry-operator/pkg/targetallocator/adapters"
 )
 
@@ -49,13 +47,8 @@ func TestExtractPromConfigFromConfig(t *testing.T) {
 		},
 	}
 
-	// prepare
-	config, err := adapters.ConfigFromString(configStr)
-	require.NoError(t, err)
-	require.NotEmpty(t, config)
-
 	// test
-	promConfig, err := ta.ConfigToPromConfig(config)
+	promConfig, err := ta.ConfigToPromConfig(configStr)
 	assert.NoError(t, err)
 
 	// verify
@@ -76,13 +69,8 @@ func TestExtractPromConfigFromNullConfig(t *testing.T) {
         endpoint: 0.0.0.0:15268
 `
 
-	// prepare
-	config, err := adapters.ConfigFromString(configStr)
-	require.NoError(t, err)
-	require.NotEmpty(t, config)
-
 	// test
-	promConfig, err := ta.ConfigToPromConfig(config)
+	promConfig, err := ta.ConfigToPromConfig(configStr)
 	assert.Equal(t, err, fmt.Errorf("%s property in the configuration doesn't contain valid %s", "prometheusConfig", "prometheusConfig"))
 
 	// verify