From 58e6a700cca50ca1b389763369d2c754a5956de0 Mon Sep 17 00:00:00 2001
From: Pavol Loffay
Date: Fri, 28 Jul 2023 12:37:37 +0200
Subject: [PATCH] Fix
Signed-off-by: Pavol Loffay
---
pkg/collector/parser/receiver.go | 5 -----
pkg/targetallocator/configmap.go | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/pkg/collector/parser/receiver.go b/pkg/collector/parser/receiver.go
index 9d6c1f1727..c25ff2f73d 100644
--- a/pkg/collector/parser/receiver.go
+++ b/pkg/collector/parser/receiver.go
@@ -29,11 +29,6 @@ import (
"github.com/open-telemetry/opentelemetry-operator/pkg/naming"
)
-var (
- // DNS_LABEL constraints: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-label-names
- dnsLabelValidation = regexp.MustCompile("^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])?$")
-)
-
// ReceiverParser is an interface that should be implemented by all receiver parsers.
type ReceiverParser interface {
// Ports returns the service ports parsed based on the receiver's configuration
diff --git a/pkg/targetallocator/configmap.go b/pkg/targetallocator/configmap.go
index 210bd1c8be..30dea41541 100644
--- a/pkg/targetallocator/configmap.go
+++ b/pkg/targetallocator/configmap.go
@@ -32,7 +32,7 @@ const (
)
func ConfigMap(instance v1alpha1.OpenTelemetryCollector) (corev1.ConfigMap, error) {
- name := naming.TAConfigMap(instance)
+ name := naming.TAConfigMap(instance.Name)
version := strings.Split(instance.Spec.Image, ":")
labels := Labels(instance, name)
if len(version) > 1 {