Remove Prometheus scraping hardcoded annotations (#10)

We can add them using `brokerAnnotations` CR value. Also, this opens up the possibility to use ServiceMonitors instead of scraping annotations.

Author: alungu

pkg/resources/cruisecontrol/deployment.go

@@ -185,7 +185,6 @@ func GeneratePodAnnotations(kafkaCluster *v1beta1.KafkaCluster, log logr.Logger,
 			"cruiseControlConfig.json":        hex.EncodeToString(hashedCruiseControlConfigJson[:]),
 			"cruiseControlClusterConfig.json": hex.EncodeToString(hashedCruiseControlClusterConfigJson[:]),
 		},
-		util.MonitoringAnnotations(metricsPort),
 	}
 
 	return util.MergeAnnotations(annotations...)

pkg/resources/kafka/pod.go

@@ -102,16 +102,13 @@ fi
 	}
 
 	pod := &corev1.Pod{
-		ObjectMeta: templates.ObjectMetaWithGeneratedNameAndAnnotations(
+		ObjectMeta: templates.ObjectMetaWithGeneratedName(
 			fmt.Sprintf("%s-%d-", r.KafkaCluster.Name, id),
 			util.MergeLabels(
 				LabelsForKafka(r.KafkaCluster.Name),
 				map[string]string{"brokerId": fmt.Sprintf("%d", id)},
 			),
-			util.MergeAnnotations(
-				brokerConfig.GetBrokerAnnotations(),
-				util.MonitoringAnnotations(metricsPort),
-			), r.KafkaCluster,
+			r.KafkaCluster,
 		),
 		Spec: corev1.PodSpec{
 			InitContainers: append(initContainers, []corev1.Container{

pkg/util/util.go

@@ -91,14 +91,6 @@ func MergeLabels(l ...map[string]string) map[string]string {
 	return res
 }
 
-// MonitoringAnnotations returns specific prometheus annotations
-func MonitoringAnnotations(port int) map[string]string {
-	return map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   strconv.Itoa(port),
-	}
-}
-
 func MergeAnnotations(annotations ...map[string]string) map[string]string {
 	rtn := make(map[string]string)
 	for _, a := range annotations {

pkg/util/util_test.go

@@ -183,17 +183,6 @@ func TestMergeLabels(t *testing.T) {
 	}
 }
 
-func TestMonitoringAnnotations(t *testing.T) {
-	expected := map[string]string{
-		"prometheus.io/scrape": "true",
-		"prometheus.io/port":   "9001",
-	}
-	anntns := MonitoringAnnotations(int(9001))
-	if !reflect.DeepEqual(expected, anntns) {
-		t.Error("Expected:", expected, "Got:", anntns)
-	}
-}
-
 func TestConvertStringToInt32(t *testing.T) {
 	i := ConvertStringToInt32("10")
 	if i != 10 {
@@ -244,7 +233,7 @@ func TestStringSliceRemove(t *testing.T) {
 }
 
 func TestMergeAnnotations(t *testing.T) {
-	annotations := MonitoringAnnotations(8888)
+	annotations := map[string]string{"foo": "bar", "bar": "foo"}
 	annotations2 := map[string]string{"thing": "1", "other_thing": "2"}
 
 	combined := MergeAnnotations(annotations, annotations2)