From 28f23d9f86cf8c46ea09f2381fe9226aa79225f4 Mon Sep 17 00:00:00 2001 From: Matej Gera Date: Wed, 6 Mar 2024 16:30:45 +0100 Subject: [PATCH] Simplify Signed-off-by: Matej Gera --- .../rendered/configmap-targetallocator.yaml | 4 +--- .../rendered/deployment-targetallocator.yaml | 2 +- .../templates/configmap-targetallocator.yaml | 8 ++------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml index a7f1ff95e..7816642fc 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/configmap-targetallocator.yaml @@ -25,7 +25,5 @@ data: matchexpressions: [] matchlabels: app: example-app - service_monitor_selector: - matchlabels: {} - matchexpressions: [] + service_monitor_selector: {} scrape_configs: [] diff --git a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml index bf4534dfa..816691cf7 100644 --- a/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml +++ b/charts/opentelemetry-collector/examples/daemonset-targetallocator/rendered/deployment-targetallocator.yaml @@ -24,7 +24,7 @@ spec: template: metadata: annotations: - checksum/config: 8d4c5822f217a437f407eb799fa268aa0fb7c35d8f86a1854c082823c318aa9f + checksum/config: fe1e2213dfddbf957fff2e2fe88f97e97df5d484e003b64e24681cff04a12a69 labels: app.kubernetes.io/name: opentelemetry-collector-target-allocator diff --git a/charts/opentelemetry-collector/templates/configmap-targetallocator.yaml b/charts/opentelemetry-collector/templates/configmap-targetallocator.yaml index d86c8c9c7..67eec308b 100644 --- a/charts/opentelemetry-collector/templates/configmap-targetallocator.yaml +++ b/charts/opentelemetry-collector/templates/configmap-targetallocator.yaml @@ -21,17 +21,13 @@ data: pod_monitor_selector: {{- include "opentelemetry-target-allocator.podMonitorSelector" . | nindent 8 }} {{- else }} - pod_monitor_selector: - matchlabels: {} - matchexpressions: [] + pod_monitor_selector: {} {{- end }} {{- if .Values.targetAllocator.prometheusCR.serviceMonitorSelector }} service_monitor_selector: {{- include "opentelemetry-target-allocator.serviceMonitorSelector" . | nindent 8 }} {{- else }} - service_monitor_selector: - matchlabels: {} - matchexpressions: [] + service_monitor_selector: {} {{- end }} scrape_configs: [] {{- end }}