[otel] switch to certmanager, build image version, different prom label

cloudoperators · Sep 27, 2024 · 65fdf71 · 65fdf71
1 parent 4e699cf
commit 65fdf71
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/opentelemetry/chart/Chart.yaml b/opentelemetry/chart/Chart.yaml
@@ -5,7 +5,6 @@ apiVersion: v2
 appVersion: v0.104.0
 name: opentelemetry-operator
 version: 0.3.10
->>>>>>> 4fa5fb8 ([otel] bump chart, remove defaults)
 description: OpenTelemetry Operator Helm chart for Kubernetes
 icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
 type: application

diff --git a/opentelemetry/chart/templates/smon-filelog.yaml b/opentelemetry/chart/templates/smon-filelog.yaml
@@ -10,6 +10,7 @@ metadata:
   name: opentelemetry-collector-logs
   labels:
     plugin: "{{ .Values.openTelemetry.prometheus }}"
+    prometheus: "{{ .Values.openTelemetry.prometheus }}"
 spec:
   podMetricsEndpoints:
     - interval: 60s

diff --git a/opentelemetry/chart/values.yaml b/opentelemetry/chart/values.yaml
@@ -30,12 +30,6 @@ opentelemetry-operator:
     enabled: false
 # Empty variables will fail during rollout
 openTelemetry:
-  OpenSearchLogs:
-    endpoint:
-    username:
-    password:
-  cluster:
-  region:
   logsCollector:
     enabled: true
   prometheus: