Merge branch '8.17' into update-version-next-8.17.10

# Conflicts:
#	.buildkite/bk.integration.pipeline.yml

Author: pkoutsovasilis

.buildkite/bk.integration.pipeline.yml

@@ -6,12 +6,12 @@ env:
 
   # The following images are defined here and their values will be updated by updatecli
   # Please do not change them manually.
-  IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1752282044"
-  IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1752282044"
-  IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1752282044"
-  IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1752282044"
-  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1752282044"
-  IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1752282044"
+  IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1752886846"
+  IMAGE_UBUNTU_2404_ARM_64: "platform-ingest-elastic-agent-ubuntu-2404-aarch64-1752886846"
+  IMAGE_RHEL_8: "platform-ingest-elastic-agent-rhel-8-1752886846"
+  IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1752886846"
+  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1752886846"
+  IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1752886846"
   # Remove AGENT_VERSION pinning once 8.17.10 DRA and stack are released
   AGENT_VERSION: "8.17.9-SNAPSHOT"
 

.buildkite/pipeline.yml

@@ -5,12 +5,12 @@ env:
 
   # The following images are defined here and their values will be updated by updatecli
   # Please do not change them manually.
-  IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1752282044"
-  IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1752282044"
-  IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1752282044"
-  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1752282044"
-  IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1752282044"
-  IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1752282044"
+  IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1752886846"
+  IMAGE_UBUNTU_2204_ARM_64: "platform-ingest-elastic-agent-ubuntu-2204-aarch64-1752886846"
+  IMAGE_WIN_2016: "platform-ingest-elastic-agent-windows-2016-1752886846"
+  IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1752886846"
+  IMAGE_WIN_10: "platform-ingest-elastic-agent-windows-10-1752886846"
+  IMAGE_WIN_11: "platform-ingest-elastic-agent-windows-11-1752886846"
 
 steps:
   - label: "check-ci"

internal/pkg/agent/cmd/upgrade_test.go

@@ -75,7 +75,7 @@ func TestUpgradeCmd(t *testing.T) {
 		require.Eventually(t, func() bool {
 			counter := atomic.LoadInt32(&mock.upgrades)
 			return counter > 0
-		}, 5*time.Second, 100*time.Millisecond)
+		}, 30*time.Second, 100*time.Millisecond)
 
 		// then we close the tcp server which is supposed to interrupt the connection
 		s.Stop()

testing/integration/k8s/k8s.go

@@ -7,7 +7,7 @@ package k8s
 import "path/filepath"
 
 const (
-	KubeStackChartVersion         = "0.3.9"
+	KubeStackChartVersion         = "0.6.3"
 	KubeStackChartName            = "opentelemetry-kube-stack"
 	KubeStackChartNameWithVersion = KubeStackChartName + "-" + KubeStackChartVersion
 	KubeStackChartArchiveName     = KubeStackChartNameWithVersion + ".tgz"

testing/integration/k8s/testdata/opentelemetry-kube-stack/.helmignore

@@ -21,3 +21,4 @@
 .idea/
 *.tmproj
 .vscode/
+examples/

testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.lock

@@ -1,15 +1,18 @@
 dependencies:
-- name: crds
+- name: otel-crds
+  repository: ""
+  version: 0.0.0
+- name: prometheus-crds
   repository: ""
   version: 0.0.0
 - name: opentelemetry-operator
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.71.1
+  version: 0.91.0
 - name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
   version: 5.21.0
 - name: prometheus-node-exporter
   repository: https://prometheus-community.github.io/helm-charts
   version: 4.37.3
-digest: sha256:ff56967acb909bc46ee586a1034ab7f8969dec606a43c48989a5bad7e4791424
-generated: "2024-10-21T15:34:58.29871407+02:00"
+digest: sha256:6bdd281bcc9df8f34dc4d553974a4ceeb9b967e10933648eecbed4f7b32570a1
+generated: "2025-07-14T12:56:09.098151354+02:00"

testing/integration/k8s/testdata/opentelemetry-kube-stack/Chart.yaml

@@ -1,14 +1,18 @@
 apiVersion: v2
-appVersion: 0.107.0
+appVersion: 0.127.0
 dependencies:
-- condition: crds.install
-  name: crds
+- condition: crds.install,crds.installOtel
+  name: otel-crds
+  repository: ""
+  version: 0.0.0
+- condition: crds.install,crds.installPrometheus
+  name: prometheus-crds
   repository: ""
   version: 0.0.0
 - condition: opentelemetry-operator.enabled
   name: opentelemetry-operator
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.71.1
+  version: 0.91.0
 - condition: kubeStateMetrics.enabled
   name: kube-state-metrics
   repository: https://prometheus-community.github.io/helm-charts
@@ -30,4 +34,4 @@ name: opentelemetry-kube-stack
 sources:
 - https://github.com/open-telemetry/opentelemetry-operator
 type: application
-version: 0.3.9
+version: 0.6.3

testing/integration/k8s/testdata/opentelemetry-kube-stack/README.md

@@ -45,6 +45,9 @@ bridge.image.tag: 0.103.0
 
 ### scrape_configs_file Details
 
+> [!NOTE]
+> This parameter only works when running the helm chart locally. When installing the helm chart using the remote repository it is not possible to include "external" scrape config files into the helm structure. This is also true when the chart is used as a subchart, and the scrape config files exists in the parent chart. Ref. [helm docs](https://helm.sh/docs/chart_template_guide/accessing_files/)
+
 By default, the daemonset collector will load in the daemon_scrape_configs.yaml file which collects prometheus metrics from applications on the same node that have the prometheus.io/scrape=true annotation, kubernetes node metrics, and cadvisor metrics. Users can disable this by settings collectors.daemon.scrape_configs_file: "" OR they can provide their own promethues scrape config file for the daemonset by supplying collectors.daemon.scrape_configs_file: "<your-file>.yaml"
 
 ## Prerequisites
@@ -144,4 +147,4 @@ The following command will show all the configurable options with detailed comme
 $ helm show values open-telemetry/opentelemetry-kube-stack
 ```
 
-When using this chart as a subchart, you may want to unset certain default values. Since Helm v3.13 values handling is improved and null can now consistently be used to remove values (e.g. to remove the default CPU limits).
+When using this chart as a subchart, you may want to unset certain default values. Since Helm v3.13 values handling is improved and null can now consistently be used to remove values (e.g. to remove the default CPU limits).

testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/.helmignore

@@ -19,6 +19,7 @@
 # Various IDEs
 .project
 .idea/
+examples/
 *.tmproj
 .vscode/
 # Release related files

testing/integration/k8s/testdata/opentelemetry-kube-stack/charts/opentelemetry-operator/CONTRIBUTING.md

@@ -3,8 +3,23 @@
 ## Bumping Default Operator Version
 
 1. Increase the minor version of the chart by one and set the patch version to zero.
-1. Update the chart's `appVersion` to match the new operator version.
-1. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
-1. Run `make generate-examples CHARTS=opentelemetry-operator`.
-1. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
-1. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases).  If any changes affect the helm chart, adjust the helm chart accordingly.
+2. Update the chart's `appVersion` to match the new operator version.
+3. In the values.yaml, update `manager.collectorImage.tag` to match the version of the collector managed by default by the operator.
+4. Run `make update-operator-crds` to update the CRDs in this chart to match the operator's.
+5. Run `make generate-examples CHARTS=opentelemetry-operator`.
+6. Review the [Operator release notes](https://github.com/open-telemetry/opentelemetry-operator/releases).  If any changes affect the helm chart, adjust the helm chart accordingly.
+
+### sed on Mac OS X
+
+If you're performing the above steps on Mac OS X, you may need to install `gnu-sed` via Homebrew
+as the pre-installed `sed` version has some incompatible differences:
+
+```sh
+brew install gnu-sed
+```
+
+Then, you can use it for make instead of the system's `sed`:
+
+```sh
+PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH" make ...
+```