rename func, name label

open-telemetry · May 20, 2024 · 84ffa49 · 84ffa49
1 parent 461925e
commit 84ffa49
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/controllers/builder_test.go b/controllers/builder_test.go
@@ -234,7 +234,7 @@ service:
 							"app.kubernetes.io/component":  "opentelemetry-collector",
 							"app.kubernetes.io/instance":   "test.test",
 							"app.kubernetes.io/managed-by": "opentelemetry-operator",
-							"app.kubernetes.io/name":       "test-collector-" + goodConfigHash,
+							"app.kubernetes.io/name":       "test-collector",
 							"app.kubernetes.io/part-of":    "opentelemetry",
 							"app.kubernetes.io/version":    "latest",
 						},
@@ -481,7 +481,7 @@ service:
 							"app.kubernetes.io/component":  "opentelemetry-collector",
 							"app.kubernetes.io/instance":   "test.test",
 							"app.kubernetes.io/managed-by": "opentelemetry-operator",
-							"app.kubernetes.io/name":       "test-collector-" + goodConfigHash,
+							"app.kubernetes.io/name":       "test-collector",
 							"app.kubernetes.io/part-of":    "opentelemetry",
 							"app.kubernetes.io/version":    "latest",
 						},
@@ -764,7 +764,7 @@ service:
 							"app.kubernetes.io/component":  "opentelemetry-collector",
 							"app.kubernetes.io/instance":   "test.test",
 							"app.kubernetes.io/managed-by": "opentelemetry-operator",
-							"app.kubernetes.io/name":       "test-collector-" + goodConfigHash,
+							"app.kubernetes.io/name":       "test-collector",
 							"app.kubernetes.io/part-of":    "opentelemetry",
 							"app.kubernetes.io/version":    "latest",
 						},
@@ -1290,7 +1290,7 @@ service:
 							"app.kubernetes.io/component":  "opentelemetry-collector",
 							"app.kubernetes.io/instance":   "test.test",
 							"app.kubernetes.io/managed-by": "opentelemetry-operator",
-							"app.kubernetes.io/name":       "test-collector-" + goodConfigHash,
+							"app.kubernetes.io/name":       "test-collector",
 							"app.kubernetes.io/part-of":    "opentelemetry",
 							"app.kubernetes.io/version":    "latest",
 						},
@@ -1684,7 +1684,7 @@ prometheus_cr:
 							"app.kubernetes.io/component":  "opentelemetry-collector",
 							"app.kubernetes.io/instance":   "test.test",
 							"app.kubernetes.io/managed-by": "opentelemetry-operator",
-							"app.kubernetes.io/name":       "test-collector-" + goodConfigHash,
+							"app.kubernetes.io/name":       "test-collector",
 							"app.kubernetes.io/part-of":    "opentelemetry",
 							"app.kubernetes.io/version":    "latest",
 						},

diff --git a/controllers/opentelemetrycollector_controller.go b/controllers/opentelemetrycollector_controller.go
@@ -134,17 +134,17 @@ func (r *OpenTelemetryCollectorReconciler) findOtelOwnedObjects(ctx context.Cont
 	if err != nil {
 		return nil, fmt.Errorf("error listing ConfigMaps: %w", err)
 	}
-	ownedConfigMaps := r.getConfigMapsToReconcile(params.OtelCol.Spec.ConfigVersions, configMapList)
+	ownedConfigMaps := r.getConfigMapsToRemove(params.OtelCol.Spec.ConfigVersions, configMapList)
 	for i := range ownedConfigMaps {
 		ownedObjects[ownedConfigMaps[i].GetUID()] = &ownedConfigMaps[i]
 	}
 
 	return ownedObjects, nil
 }
 
-// getConfigMapsToReconcile returns a list of ConfigMaps to reconcile based on the number of ConfigMaps to keep.
+// getConfigMapsToRemove returns a list of ConfigMaps to remove based on the number of ConfigMaps to keep.
 // It keeps the newest ConfigMap, the `configVersionsToKeep` next newest ConfigMaps, and returns the remainder.
-func (r *OpenTelemetryCollectorReconciler) getConfigMapsToReconcile(configVersionsToKeep int, configMapList *corev1.ConfigMapList) []corev1.ConfigMap {
+func (r *OpenTelemetryCollectorReconciler) getConfigMapsToRemove(configVersionsToKeep int, configMapList *corev1.ConfigMapList) []corev1.ConfigMap {
 	ownedConfigMaps := []corev1.ConfigMap{}
 	sort.Slice(configMapList.Items, func(i, j int) bool {
 		iTime := configMapList.Items[i].GetCreationTimestamp().Time

diff --git a/internal/manifests/collector/configmap.go b/internal/manifests/collector/configmap.go
@@ -29,7 +29,8 @@ func ConfigMap(params manifests.Params) (*corev1.ConfigMap, error) {
 		return nil, err
 	}
 	name := naming.ConfigMap(params.OtelCol.Name, hash)
-	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, name, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
+	collectorName := naming.Collector(params.OtelCol.Name)
+	labels := manifestutils.Labels(params.OtelCol.ObjectMeta, collectorName, params.OtelCol.Spec.Image, ComponentOpenTelemetryCollector, []string{})
 
 	replacedConf, err := ReplaceConfig(params.OtelCol)
 	if err != nil {

diff --git a/internal/manifests/collector/configmap_test.go b/internal/manifests/collector/configmap_test.go
@@ -61,7 +61,7 @@ service:
 		expectedName := naming.ConfigMap("test", hash)
 
 		expectedLables["app.kubernetes.io/component"] = "opentelemetry-collector"
-		expectedLables["app.kubernetes.io/name"] = expectedName
+		expectedLables["app.kubernetes.io/name"] = "test-collector"
 		expectedLables["app.kubernetes.io/version"] = "0.47.0"
 
 		actual, err := ConfigMap(param)
@@ -104,7 +104,7 @@ service:
 		expectedName := naming.ConfigMap("test", hash)
 
 		expectedLables["app.kubernetes.io/component"] = "opentelemetry-collector"
-		expectedLables["app.kubernetes.io/name"] = expectedName
+		expectedLables["app.kubernetes.io/name"] = "test-collector"
 		expectedLables["app.kubernetes.io/version"] = "latest"
 
 		param.OtelCol.Spec.TargetAllocator.Enabled = true