Use AnyConfig for Scrape Configs in v1beta1.TargetAllocator

Author: swiatekm

apis/v1beta1/targetallocator_types.go

@@ -17,8 +17,6 @@
 package v1beta1
 
 import (
-	"encoding/json"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -44,7 +42,7 @@ type TargetAllocatorSpec struct {
 	// For the exact format, see https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config.
 	// +optional
 	// +listType=atomic
-	ScrapeConfigs []ScrapeConfig `json:"scrapeConfigs,omitempty"`
+	ScrapeConfigs []AnyConfig `json:"scrapeConfigs,omitempty"`
 	// PrometheusCR defines the configuration for the retrieval of PrometheusOperator CRDs ( servicemonitor.monitoring.coreos.com/v1 and podmonitor.monitoring.coreos.com/v1 ).
 	// +optional
 	PrometheusCR TargetAllocatorPrometheusCR `json:"prometheusCR,omitempty"`
@@ -85,46 +83,6 @@ type TargetAllocatorStatus struct {
 	Image string `json:"image,omitempty"`
 }
 
-// ScrapeConfig is a Prometheus scrape config definition.
-type ScrapeConfig map[string]interface{}
-
-// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
-func (in *ScrapeConfig) DeepCopyInto(out *ScrapeConfig) {
-	*out = make(map[string]interface{}, len(*in))
-	for key, val := range *in {
-		(*out)[key] = val
-	}
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ScrapeConfig.
-func (in *ScrapeConfig) DeepCopy() *ScrapeConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(ScrapeConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-var _ json.Marshaler = &ScrapeConfig{}
-var _ json.Unmarshaler = &ScrapeConfig{}
-
-// UnmarshalJSON implements an alternative parser for this field.
-func (c *ScrapeConfig) UnmarshalJSON(b []byte) error {
-	if err := json.Unmarshal(b, c); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON specifies how to convert this object into JSON.
-func (c *ScrapeConfig) MarshalJSON() ([]byte, error) {
-	if c == nil {
-		return []byte("{}"), nil
-	}
-	return json.Marshal(c)
-}
-
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

apis/v1beta1/zz_generated.deepcopy.go

@@ -75,7 +75,7 @@ func TargetAllocator(params manifests.Params) (*v1beta1.TargetAllocator, error)
 	}, nil
 }
 
-func getScrapeConfigs(otelcolConfig string) ([]v1beta1.ScrapeConfig, error) {
+func getScrapeConfigs(otelcolConfig string) ([]v1beta1.AnyConfig, error) {
 	// Collector supports environment variable substitution, but the TA does not.
 	// TA Scrape Configs should have a single "$", as it does not support env var substitution
 	prometheusReceiverConfig, err := adapters.UnescapeDollarSignsInPromConfig(otelcolConfig)
@@ -88,10 +88,10 @@ func getScrapeConfigs(otelcolConfig string) ([]v1beta1.ScrapeConfig, error) {
 		return nil, err
 	}
 
-	v1beta1scrapeConfigs := make([]v1beta1.ScrapeConfig, len(scrapeConfigs))
+	v1beta1scrapeConfigs := make([]v1beta1.AnyConfig, len(scrapeConfigs))
 
 	for i, config := range scrapeConfigs {
-		v1beta1scrapeConfigs[i] = config
+		v1beta1scrapeConfigs[i] = v1beta1.AnyConfig{Object: config}
 	}
 
 	return v1beta1scrapeConfigs, nil

internal/manifests/collector/targetallocator.go

@@ -84,7 +84,7 @@ func TestTargetAllocator(t *testing.T) {
 					CollectorSelector: metav1.LabelSelector{
 						MatchLabels: manifestutils.SelectorLabels(objectMetadata, ComponentOpenTelemetryCollector),
 					},
-					ScrapeConfigs: []v1beta1.ScrapeConfig{},
+					ScrapeConfigs: []v1beta1.AnyConfig{},
 				},
 			},
 		},
@@ -107,7 +107,7 @@ func TestGetScrapeConfigs(t *testing.T) {
 	testCases := []struct {
 		name    string
 		input   v1beta1.Config
-		want    []v1beta1.ScrapeConfig
+		want    []v1beta1.AnyConfig
 		wantErr error
 	}{
 		{
@@ -123,7 +123,7 @@ func TestGetScrapeConfigs(t *testing.T) {
 					},
 				},
 			},
-			want: []v1beta1.ScrapeConfig{},
+			want: []v1beta1.AnyConfig{},
 		},
 		{
 			name: "no scrape configs key",
@@ -155,10 +155,8 @@ func TestGetScrapeConfigs(t *testing.T) {
 					},
 				},
 			},
-			want: []v1beta1.ScrapeConfig{
-				{
-					"job": "somejob",
-				},
+			want: []v1beta1.AnyConfig{
+				{Object: map[string]interface{}{"job": "somejob"}},
 			},
 		},
 	}