Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Oct 6, 2025

What does this PR do?

Fixes #10020

Upstream fix of Helm Chart uninstallation open-telemetry/opentelemetry-helm-charts#1877

Why is it important?

Any deployment of the kube-stack Helm Chart prior to v0.10.5 version cannot be uninstalled.

Checklist

  • I have read and understood the pull request guidelines of this project.
  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in ./changelog/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

This is an automatic backport of pull request #10145 done by [Mergify](https://mergify.com).

* test: remove otel skip statement

* chore: bump kube-stack Helm Chart to 0.9.4

* chore: bump kube-stack to 0.10.4

* chore: bump kube-stack to 0.10.5

---------

Co-authored-by: Ruben Ruiz de Gauna <[email protected]>
(cherry picked from commit b74a86b)
@mergify mergify bot requested a review from a team as a code owner October 6, 2025 14:45
@mergify mergify bot added the backport label Oct 6, 2025
@mergify mergify bot requested review from blakerouse and swiatekm and removed request for a team October 6, 2025 14:45
@mergify mergify bot added the backport label Oct 6, 2025
@mergify mergify bot mentioned this pull request Oct 6, 2025
8 tasks
@github-actions github-actions bot added Team:Elastic-Agent-Control-Plane Label for the Agent Control Plane team skip-changelog labels Oct 6, 2025
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane)

@rogercoll
Copy link
Contributor

@elastic/elastic-agent-control-plane Is there any planned release from this branch? The inital PR #10145 considered 9.0 as an active backport. The issue is that the kube-stack integration tests fail with the following error message:

Starting in otel mode
failed to get config: cannot unmarshal the configuration: decoding failed due to the following error(s):

'processors' error reading configuration for "k8sattributes": decoding failed due to the following error(s):

'extract' has invalid keys: otel_annotations

That is because the k8sattributes Otel component in the 9.0 build is not up-to-date.

@rogercoll
Copy link
Contributor

The otel_annotations configuration comes from the new kube-stack Helm Chart version. An alternative to prevent including this configuration in the deployed release is setting the upstream k8sattributes processor to null and reuse the current configuration without the otel_annotations field:

--- i/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
+++ w/deploy/helm/edot-collector/kube-stack/managed_otlp/values.yaml
@@ -17,7 +17,7 @@ crds:
 defaultCRConfig:
   image:
     repository: "docker.elastic.co/beats/elastic-agent"
   targetAllocator:
     enabled: false # Enable/disable the Operator's Target allocator.
     # Refer to: https://github.com/open-telemetry/opentelemetry-operator/tree/main/cmd/otel-allocator
@@ -315,7 +315,7 @@ collectors:
               from_attribute: host.id
               action: insert
         # [K8s Attributes Processor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/k8s
attributesprocessor)
-        k8sattributes:
+        k8sattributes/edot:
           filter:
             # Only retrieve pods running on the same node as the collector
             node_from_env_var: OTEL_K8S_NODE_NAME
@@ -351,6 +351,7 @@ collectors:
               - tag_name: app.label.version
                 key: app.kubernetes.io/version
                 from: pod
+        k8sattributes: null
       receivers:
         # [OTLP Receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
         otlp:
@@ -490,7 +491,7 @@ collectors:
               - filelog
             processors:
               - batch
-              - k8sattributes
+              - k8sattributes/edot
               - resourcedetection/system
               - resourcedetection/eks
               - resourcedetection/gcp
@@ -506,7 +507,7 @@ collectors:
               - hostmetrics
             processors:
               - batch/metrics
-              - k8sattributes
+              - k8sattributes/edot
               - resourcedetection/system
               - resourcedetection/eks
               - resourcedetection/gcp

@rogercoll rogercoll requested a review from a team as a code owner October 9, 2025 13:25
@rogercoll
Copy link
Contributor

As there is no plan to update the Otel collector components, the configuration was updated to avoid using the otel_annotations option with 630350a

@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

History

cc @rogercoll

Copy link
Contributor

@gregkalapos gregkalapos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed in our weekly, I think this is a good way to go here.

@rogercoll rogercoll merged commit 9f8e57a into 9.0 Oct 10, 2025
21 checks passed
@rogercoll rogercoll deleted the mergify/bp/9.0/pr-10145 branch October 10, 2025 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants