Fix Target Allocator config reload (#1924)

open-telemetry · Jul 14, 2023 · 56f5de9 · 56f5de9
1 parent ec1e0a3
commit 56f5de9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 8 deletions.
diff --git a/pkg/targetallocator/annotations.go b/pkg/targetallocator/annotations.go
@@ -35,15 +35,21 @@ func Annotations(instance v1alpha1.OpenTelemetryCollector) map[string]string {
 
 	configMap, err := ConfigMap(instance)
 	if err == nil {
-		annotations[configMapHashAnnotationKey] = getConfigMapSHA(configMap)
+		cmHash := getConfigMapSHA(configMap)
+		if cmHash != "" {
+			annotations[configMapHashAnnotationKey] = getConfigMapSHA(configMap)
+		}
 	}
 
 	return annotations
 }
 
 // getConfigMapSHA returns the hash of the content of the TA ConfigMap.
 func getConfigMapSHA(configMap v1.ConfigMap) string {
-	configBytes := configMap.BinaryData[targetAllocatorFilename]
-	h := sha256.Sum256(configBytes)
+	configString, ok := configMap.Data[targetAllocatorFilename]
+	if !ok {
+		return ""
+	}
+	h := sha256.Sum256([]byte(configString))
 	return fmt.Sprintf("%x", h)
 }
diff --git a/pkg/targetallocator/annotations_test.go b/pkg/targetallocator/annotations_test.go
@@ -15,6 +15,8 @@
 package targetallocator
 
 import (
+	"crypto/sha256"
+	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -32,10 +34,15 @@ func TestPodAnnotations(t *testing.T) {
 
 func TestConfigMapHash(t *testing.T) {
 	instance := collectorInstance()
+	expectedConfigMap, err := ConfigMap(instance)
+	require.NoError(t, err)
+	expectedConfig := expectedConfigMap.Data[targetAllocatorFilename]
+	require.NotEmpty(t, expectedConfig)
+	expectedHash := sha256.Sum256([]byte(expectedConfig))
 	annotations := Annotations(instance)
 	require.Contains(t, annotations, configMapHashAnnotationKey)
 	cmHash := annotations[configMapHashAnnotationKey]
-	assert.Len(t, cmHash, 64)
+	assert.Equal(t, fmt.Sprintf("%x", expectedHash), cmHash)
 }
 
 func TestInvalidConfigNoHash(t *testing.T) {

diff --git a/tests/e2e/smoke-targetallocator/00-assert.yaml b/tests/e2e/smoke-targetallocator/00-assert.yaml
@@ -13,6 +13,7 @@ metadata:
 status:
   replicas: 1
   readyReplicas: 1
+  observedGeneration: 1
 ---
 apiVersion: v1
 kind: ConfigMap

diff --git a/tests/e2e/smoke-targetallocator/00-install.yaml b/tests/e2e/smoke-targetallocator/00-install.yaml
@@ -28,6 +28,8 @@ spec:
     enabled: true
     serviceAccount: ta
     image: "local/opentelemetry-operator-targetallocator:e2e"
+    prometheusCR:
+      enabled: true
   config: |
     receivers:
       jaeger:
@@ -42,9 +44,9 @@ spec:
               scrape_interval: 10s
               static_configs:
                 - targets: [ '0.0.0.0:8888' ]
-    
+
     processors:
-    
+
     exporters:
       logging:
     service:

diff --git a/tests/e2e/smoke-targetallocator/01-change-ta-config.yaml b/tests/e2e/smoke-targetallocator/01-change-ta-config.yaml
@@ -10,6 +10,8 @@ spec:
     image: "local/opentelemetry-operator-targetallocator:e2e"
     prometheusCR:
       enabled: true
+      serviceMonitorSelector:
+        key: value # this is just an arbitrary change to the target allocator config
   config: |
     receivers:
       jaeger:
@@ -24,9 +26,9 @@ spec:
               scrape_interval: 10s
               static_configs:
                 - targets: [ '0.0.0.0:8888' ]
-    
+
     processors:
-    
+
     exporters:
       logging:
     service: