chore(deps): update otel/opentelemetry-collector docker tag to v0.99.0 (

#182) * chore(deps): update otel/opentelemetry-collector docker tag to v0.99.0 * fix: Adjust to new version of collector and deprecate chart * chore: Update docs * fix: Remove maintainers as chart has been deprecated --------- Co-authored-by: Thor Anker Kvisgård Lange <tal@netic.dk>
neticdk · May 1, 2024 · f14cedd · f14cedd
1 parent 4c57745
commit f14cedd
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
@@ -1,9 +1,7 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.1.2
-appVersion: 0.27.0
+version: 0.1.3
+appVersion: 0.99.0
 type: application
 description: A small Helm chart to install OpenTelemetry Collector
-maintainers:
-  - name: langecode
-    email: tal@netic.dk
+deprecated: true
diff --git a/charts/opentelemetry-collector/README.md b/charts/opentelemetry-collector/README.md
@@ -1,6 +1,8 @@
 # opentelemetry-collector
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.27.0](https://img.shields.io/badge/AppVersion-0.27.0-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.99.0](https://img.shields.io/badge/AppVersion-0.99.0-informational?style=flat-square)
+
+**DEPRECATED** We recommend using: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-collector
 
 A small Helm chart to install OpenTelemetry Collector
 
@@ -18,7 +20,7 @@ $ helm install my-release netic-oaas/opentelemetry-collector
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | config.exporters | object | `{}` |  |
-| config.extensions.health_check.port | int | `13133` |  |
+| config.extensions.health_check.endpoint | string | `"0.0.0.0:13133"` |  |
 | config.extensions.zpages.endpoint | string | `"localhost:55679"` |  |
 | config.receivers.otlp.protocols.grpc.endpoint | string | `"0.0.0.0:4317"` |  |
 | config.receivers.otlp.protocols.http.endpoint | string | `"0.0.0.0:55681"` |  |

diff --git a/charts/opentelemetry-collector/README.md.gotmpl b/charts/opentelemetry-collector/README.md.gotmpl
@@ -1,6 +1,8 @@
 {{ template "chart.header" . }}
 {{ template "chart.versionBadge" . }}{{ template "chart.typeBadge" . }}{{ template "chart.appVersionBadge" . }}
 
+**DEPRECATED** We recommend using: https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-collector
+
 {{ template "chart.description" . }}
 
 {{ template "chart.homepageLine" . }}

diff --git a/charts/opentelemetry-collector/ci/default-values.yaml b/charts/opentelemetry-collector/ci/default-values.yaml
@@ -1,10 +1,9 @@
 config:
   exporters:
-    logging:
-      logLevel: debug
+    debug: {}
   service:
     pipelines:
       traces:
         receivers: [otlp]
         processors: [memory_limiter, batch]
-        exporters: [logging]
+        exporters: [debug]
diff --git a/charts/opentelemetry-collector/templates/configmap.yaml b/charts/opentelemetry-collector/templates/configmap.yaml
@@ -9,7 +9,6 @@ data:
     processors:
       batch:
       memory_limiter:
-        ballast_size_mib: {{ include "otel-collector.getMemBallastSizeMib" .Values.resources.limits.memory }}
         limit_mib: {{ include "otel-collector.getMemLimitMib" .Values.resources.limits.memory }}
         spike_limit_mib: {{ include "otel-collector.getMemSpikeLimitMib" .Values.resources.limits.memory }}
         check_interval: 5s

diff --git a/charts/opentelemetry-collector/templates/deployment.yaml b/charts/opentelemetry-collector/templates/deployment.yaml
@@ -26,8 +26,6 @@ spec:
         securityContext: {{ toYaml .Values.securityContext | nindent 10 }}
         args:
           - "--config=/conf/otel-collector-config.yaml"
-          - "--metrics-addr=0.0.0.0:8888"
-          - "--mem-ballast-size-mib={{ include "otel-collector.getMemBallastSizeMib" .Values.resources.limits.memory }}"
         resources: {{ .Values.resources | toYaml | nindent 10 }}
         ports:
         - name: grpc
@@ -42,11 +40,11 @@ spec:
         livenessProbe:
           httpGet:
             path: /
-            port: {{ .Values.config.extensions.health_check.port }}
+            port: 13133
         readinessProbe:
           httpGet:
             path: /
-            port: {{ .Values.config.extensions.health_check.port }}
+            port: 13133
       volumes:
         - name: otel-collector-config-vol
           configMap:

diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -10,7 +10,7 @@ config:
   exporters: {}
   extensions:
     health_check:
-      port: 13133
+      endpoint: 0.0.0.0:13133
     zpages:
       endpoint: localhost:55679
   service: