PR comments fixes

open-telemetry · Jan 25, 2022 · f216c31 · f216c31
1 parent 2b4da33
commit f216c31
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 378 deletions.
diff --git a/go.sum b/go.sum
diff --git a/pkg/collector/annotations.go b/pkg/collector/annotations.go
@@ -22,9 +22,9 @@ import (
 )
 
 // Annotations return the annotations for OpenTelemetryCollector pod.
-func Annotations(instance v1alpha1.OpenTelemetryCollector) (map[string]string, map[string]string) {
+func Annotations(instance v1alpha1.OpenTelemetryCollector) map[string]string {
 	// new map every time, so that we don't touch the instance's annotations
-	annotations, podAnnotations := map[string]string{}, map[string]string{}
+	annotations := map[string]string{}
 
 	// set default prometheus annotations
 	annotations["prometheus.io/scrape"] = "true"
@@ -37,18 +37,26 @@ func Annotations(instance v1alpha1.OpenTelemetryCollector) (map[string]string, m
 			annotations[k] = v
 		}
 	}
+	// make sure sha256 for configMap is always calculated
+	annotations["opentelemetry-operator-config/sha256"] = getConfigMapSHA(instance.Spec.Config)
 
-	if nil != instance.Spec.PodAnnotations {
-		for k, v := range instance.Spec.PodAnnotations {
-			podAnnotations[k] = v
-		}
+	return annotations
+}
+
+// PodAnnotations return the spec annotations for OpenTelemetryCollector pod.
+func PodAnnotations(instance v1alpha1.OpenTelemetryCollector) map[string]string {
+	// new map every time, so that we don't touch the instance's annotations
+	podAnnotations := map[string]string{}
+
+	// allow override of pod annotations
+	for k, v := range instance.Spec.PodAnnotations {
+		podAnnotations[k] = v
 	}
 
 	// make sure sha256 for configMap is always calculated
-	annotations["opentelemetry-operator-config/sha256"] = getConfigMapSHA(instance.Spec.Config)
 	podAnnotations["opentelemetry-operator-config/sha256"] = getConfigMapSHA(instance.Spec.Config)
 
-	return annotations, podAnnotations
+	return podAnnotations
 }
 
 func getConfigMapSHA(config string) string {

diff --git a/pkg/collector/annotations_test.go b/pkg/collector/annotations_test.go
@@ -36,7 +36,8 @@ func TestDefaultAnnotations(t *testing.T) {
 	}
 
 	// test
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	//verify
 	assert.Equal(t, "true", annotations["prometheus.io/scrape"])
@@ -64,7 +65,8 @@ func TestUserAnnotations(t *testing.T) {
 	}
 
 	// test
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	//verify
 	assert.Equal(t, "false", annotations["prometheus.io/scrape"])
@@ -86,7 +88,8 @@ func TestAnnotationsPropagateDown(t *testing.T) {
 	}
 
 	// test
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	// verify
 	assert.Len(t, annotations, 5)

diff --git a/pkg/collector/daemonset.go b/pkg/collector/daemonset.go
@@ -30,7 +30,8 @@ func DaemonSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem
 	labels := Labels(otelcol)
 	labels["app.kubernetes.io/name"] = naming.Collector(otelcol)
 
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	return appsv1.DaemonSet{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/pkg/collector/deployment.go b/pkg/collector/deployment.go
@@ -30,7 +30,8 @@ func Deployment(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTele
 	labels := Labels(otelcol)
 	labels["app.kubernetes.io/name"] = naming.Collector(otelcol)
 
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	return appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{

diff --git a/pkg/collector/statefulset.go b/pkg/collector/statefulset.go
@@ -30,7 +30,8 @@ func StatefulSet(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTel
 	labels := Labels(otelcol)
 	labels["app.kubernetes.io/name"] = naming.Collector(otelcol)
 
-	annotations, podAnnotations := Annotations(otelcol)
+	annotations := Annotations(otelcol)
+	podAnnotations := PodAnnotations(otelcol)
 
 	return appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{