Implemented TargetAllocator resource deployments.

go.mod

@@ -21,7 +21,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/oklog/run v1.1.0
 	github.com/openshift/api v3.9.0+incompatible
-	github.com/operator-framework/operator-lib v0.11.0
 	github.com/prometheus-operator/prometheus-operator v0.70.0
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.70.0
 	github.com/prometheus-operator/prometheus-operator/pkg/client v0.70.0

go.sum

@@ -549,14 +549,10 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
-github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
 github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
 github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
 github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
 github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
@@ -569,8 +565,6 @@ github.com/openshift/api v0.0.0-20180801171038-322a19404e37 h1:05irGU4HK4IauGGDb
 github.com/openshift/api v0.0.0-20180801171038-322a19404e37/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
-github.com/operator-framework/operator-lib v0.11.0 h1:eYzqpiOfq9WBI4Trddisiq/X9BwCisZd3rIzmHRC9Z8=
-github.com/operator-framework/operator-lib v0.11.0/go.mod h1:RpyKhFAoG6DmKTDIwMuO6pI3LRc8IE9rxEYWy476o6g=
 github.com/ovh/go-ovh v1.4.3 h1:Gs3V823zwTFpzgGLZNI6ILS4rmxZgJwJCz54Er9LwD0=
 github.com/ovh/go-ovh v1.4.3/go.mod h1:AkPXVtgwB6xlKblMjRKJJmjRp+ogrE7fz2lVgcQY8SY=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -1103,8 +1097,6 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

internal/manifests/collector/collector.go

@@ -32,7 +32,6 @@ func Build(params manifests.Params) ([]client.Object, error) {
 		params.Log.V(5).Info("not building sidecar...")
 	}
 	manifestFactories = append(manifestFactories, []manifests.K8sManifestFactory{
-		manifests.Factory(ConfigMap),
 		manifests.FactoryWithoutError(HorizontalPodAutoscaler),
 		manifests.FactoryWithoutError(ServiceAccount),
 		manifests.Factory(Service),
@@ -47,9 +46,6 @@ func Build(params manifests.Params) ([]client.Object, error) {
 			manifestFactories = append(manifestFactories, manifests.Factory(ServiceMonitor))
 		}
 	}
-	if !params.OtelCol.Spec.Prometheus.IsEmpty() {
-		manifestFactories = append(manifestFactories, manifests.Factory(PrometheusConfigMap))
-	}
 	for _, factory := range manifestFactories {
 		res, err := factory(params)
 		if err != nil {
@@ -58,6 +54,13 @@ func Build(params manifests.Params) ([]client.Object, error) {
 			resourceManifests = append(resourceManifests, res)
 		}
 	}
+	configmaps, err := ConfigMaps(params)
+	if err != nil {
+		return nil, err
+	}
+	for _, configmap := range configmaps {
+		resourceManifests = append(resourceManifests, configmap)
+	}
 	routes, err := Routes(params)
 	if err != nil {
 		return nil, err

internal/manifests/collector/config_replace.go

@@ -47,6 +47,9 @@ func ReplaceConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, error) {
 	return string(out), nil
 }
 
+// ReplacePrometheusConfig replaces the prometheus configuration that the customer provides with itself (if the
+// target-allocator isn't enabled) or the target_allocator configuration (if the target-allocator is enabled)
+// and populates it into the prometheus.yaml file, which is seen in its ConfigMap.
 func ReplacePrometheusConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, error) {
 	promConfigYaml, err := instance.Spec.Prometheus.Yaml()
 	if err != nil {
@@ -79,7 +82,7 @@ func ReplacePrometheusConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, e
 	}
 
 	if featuregate.EnableTargetAllocatorRewrite.IsEnabled() {
-		updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TAService(instance.Name))
+		updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TargetAllocatorServiceName)
 		if getCfgPromErr != nil {
 			return "", getCfgPromErr
 		}
@@ -92,7 +95,7 @@ func ReplacePrometheusConfig(instance v1alpha1.AmazonCloudWatchAgent) (string, e
 		return string(out), nil
 	}
 
-	updPromCfgMap, err := ta.AddHTTPSDConfigToPromConfig(promCfgMap, naming.TAService(instance.Name))
+	updPromCfgMap, err := ta.AddHTTPSDConfigToPromConfig(promCfgMap, naming.TargetAllocatorServiceName)
 	if err != nil {
 		return "", err
 	}

internal/manifests/collector/config_replace_test.go

@@ -84,7 +84,7 @@ func TestPrometheusParser(t *testing.T) {
 		for _, scrapeConfig := range cfg.PromConfig.ScrapeConfigs {
 			assert.Len(t, scrapeConfig.ServiceDiscoveryConfigs, 1)
 			assert.Equal(t, scrapeConfig.ServiceDiscoveryConfigs[0].Name(), "http")
-			assert.Equal(t, scrapeConfig.ServiceDiscoveryConfigs[0].(*http.SDConfig).URL, "http://test-target-allocator:80/jobs/"+scrapeConfig.JobName+"/targets?collector_id=$POD_NAME")
+			assert.Equal(t, scrapeConfig.ServiceDiscoveryConfigs[0].(*http.SDConfig).URL, "http://target-allocator-service:80/jobs/"+scrapeConfig.JobName+"/targets")
 			expectedMap[scrapeConfig.JobName] = true
 		}
 		for k := range expectedMap {
@@ -108,7 +108,7 @@ func TestPrometheusParser(t *testing.T) {
 		assert.NotContains(t, prometheusConfig, "scrape_configs")
 
 		expectedTAConfig := map[interface{}]interface{}{
-			"endpoint": "http://test-target-allocator:80",
+			"endpoint": "http://target-allocator-service:80",
 			"interval": "30s",
 		}
 		assert.Equal(t, expectedTAConfig, promCfgMap["target_allocator"])
@@ -162,7 +162,7 @@ func TestPrometheusParser(t *testing.T) {
 		assert.NotContains(t, prometheusConfig, "scrape_configs")
 
 		expectedTAConfig := map[interface{}]interface{}{
-			"endpoint": "http://test-target-allocator:80",
+			"endpoint": "http://target-allocator-service:80",
 			"interval": "30s",
 		}
 		assert.Equal(t, expectedTAConfig, promCfgMap["target_allocator"])
@@ -307,7 +307,7 @@ func TestReplacePrometheusConfig(t *testing.T) {
   scrape_configs:
   - honor_labels: true
     http_sd_configs:
-    - url: http://test-target-allocator:80/jobs/service-x/targets?collector_id=$POD_NAME
+    - url: http://target-allocator-service:80/jobs/service-x/targets
     job_name: service-x
     metric_relabel_configs:
     - action: keep
@@ -360,7 +360,7 @@ func TestReplacePrometheusConfig(t *testing.T) {
     scrape_interval: 1m
     scrape_timeout: 10s
 target_allocator:
-  endpoint: http://test-target-allocator:80
+  endpoint: http://target-allocator-service:80
   interval: 30s
 `
 

internal/manifests/collector/configmap.go

@@ -4,56 +4,84 @@
 package collector
 
 import (
+	"fmt"
+
+	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	"github.com/aws/amazon-cloudwatch-agent-operator/internal/manifests/collector/adapters"
+
 	"github.com/aws/amazon-cloudwatch-agent-operator/internal/manifests"
 	"github.com/aws/amazon-cloudwatch-agent-operator/internal/manifests/manifestutils"
 	"github.com/aws/amazon-cloudwatch-agent-operator/internal/naming"
 )
 
-func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
+func ConfigMaps(params manifests.Params) ([]*corev1.ConfigMap, error) {
+	var configmaps []*corev1.ConfigMap
+
 	name := naming.ConfigMap(params.OtelCol.Name)
 	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentAmazonCloudWatchAgent, []string{})
 
 	replacedConf, err := ReplaceConfig(params.OtelCol)
 	if err != nil {
-		params.Log.V(2).Info("failed to update prometheus config to use sharded targets: ", "err", err)
+		params.Log.V(2).Info("failed to update config: ", "err", err)
 		return nil, err
 	}
 
-	return &corev1.ConfigMap{
+	configmaps = append(configmaps, &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        name,
 			Namespace:   params.OtelCol.Namespace,
 			Labels:      labels,
 			Annotations: params.OtelCol.Annotations,
 		},
 		Data: map[string]string{
-			"cwagentconfig.json": replacedConf,
+			params.Config.CollectorConfigMapEntry(): replacedConf,
 		},
-	}, nil
-}
+	})
 
-func PrometheusConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
-	name := naming.PrometheusConfigMap(params.OtelCol.Name)
-	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, "", ComponentAmazonCloudWatchAgent, []string{})
+	if !params.OtelCol.Spec.Prometheus.IsEmpty() {
+		promName := naming.PrometheusConfigMap(params.OtelCol.Name)
+		promLabels := manifestutils.Labels(params.OtelCol.ObjectMeta, promName, "", ComponentAmazonCloudWatchAgent, []string{})
 
-	replacedPrometheusConf, err := ReplacePrometheusConfig(params.OtelCol)
-	if err != nil {
-		params.Log.V(2).Info("failed to update prometheus config to use sharded targets: ", "err", err)
-		return nil, err
+		replacedPrometheusConf, err := ReplacePrometheusConfig(params.OtelCol)
+		if err != nil {
+			params.Log.V(2).Info("failed to update prometheus config to use sharded targets: ", "err", err)
+			return nil, err
+		}
+
+		if !params.OtelCol.Spec.TargetAllocator.Enabled {
+			replacedPrometheusConfig, err := adapters.ConfigFromString(replacedPrometheusConf)
+			if err != nil {
+				return nil, err
+			}
+
+			replacedPrometheusConfProp, ok := replacedPrometheusConfig["config"]
+			if !ok {
+				return nil, fmt.Errorf("no prometheusConfig available as part of the configuration")
+			}
+
+			replacedPrometheusConfPropYAML, err := yaml.Marshal(replacedPrometheusConfProp)
+			if err != nil {
+				return nil, err
+			}
+
+			replacedPrometheusConf = string(replacedPrometheusConfPropYAML)
+		}
+
+		configmaps = append(configmaps, &corev1.ConfigMap{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:        promName,
+				Namespace:   params.OtelCol.Namespace,
+				Labels:      promLabels,
+				Annotations: params.OtelCol.Annotations,
+			},
+			Data: map[string]string{
+				params.Config.PrometheusConfigMapEntry(): replacedPrometheusConf,
+			},
+		})
 	}
 
-	return &corev1.ConfigMap{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:        name,
-			Namespace:   params.OtelCol.Namespace,
-			Labels:      labels,
-			Annotations: params.OtelCol.Annotations,
-		},
-		Data: map[string]string{
-			"prometheus.yaml": replacedPrometheusConf,
-		},
-	}, nil
+	return configmaps, nil
 }